| commit | 7dbf0696ef37097f2bcec058f876f7f4ba63d357 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Jan 26 11:10:29 2011 -0800 |
| committer | Kenny Root <kroot@google.com> | Wed Jan 26 11:10:36 2011 -0800 |
| tree | 0ca840b19f1e8f46bd1d646e9ea45b46211ae9c1 | |
| parent | 7c55da5db50400400efbcd53a5cdc1a79c04cc63 [diff] | |
| parent | 2c1d0967ba23f7e806e338bc74148bed93823706 [diff] |
resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c