| commit | 20bbfe73dd1d33cb67d68ad05c71ba0aa2813f22 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sun Jan 30 12:54:18 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jan 30 12:54:18 2011 -0800 |
| tree | a8a2a69ccc36c4ce3918f7f4dea7043d3f8d0d65 | |
| parent | f2b39b4773e7af57bb95f1344d4da3ea55c5ccfb [diff] | |
| parent | 44d258d5be10ff68e0eae700b6439ec4b94f5a31 [diff] |
am 44d258d5: Reconcile gingerbread-plus-aosp and honeycomb * commit '44d258d5be10ff68e0eae700b6439ec4b94f5a31': resolved conflicts for merge of a314f32b to honeycomb-merge