| commit | 544de0b31f705a98ecaf7700e05214c1adfc822e | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Apr 04 11:21:23 2011 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Mon Apr 04 11:21:23 2011 -0700 |
| tree | bcc9944cad769296d6d1e7f1929cc813c29eaba3 | |
| parent | e40f8ffe517474aef31626097365547467b2f3c8 [diff] | |
| parent | f9a75b96bd31e49061fc73afef971830035dfdf1 [diff] |
resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd