| commit | 1b8798894c90ef5deaf4f49d468e959ea3c19131 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Feb 22 11:13:23 2011 -0800 |
| committer | Kenny Root <kroot@google.com> | Tue Feb 22 11:13:23 2011 -0800 |
| tree | 27dded29c88067d89cd543fa7d95246d93d587fe | |
| parent | a3c3bc336600bb30680adb920e0b17b28e250dc0 [diff] | |
| parent | 747a9780a8e6bfae5a69540e017a50aaac9c6758 [diff] |
resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp Change-Id: I06b2fba1d14343bf0489447a01bb7d0bdb675307