| commit | 8eb67e74ab0e21de8c0811f4fe5aa5185d69fcf8 | [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 | 1c24e7eede678d522f68189ff33aeb551dd701a2 | |
| parent | df852d886071e109afc3dab17c1576811a9a6a01 [diff] | |
| parent | 4d271f15beec4c091a62791af51cf2ac68cd4e4e [diff] |
am 4d271f15: Reconcile gingerbread-plus-aosp and honeycomb * commit '4d271f15beec4c091a62791af51cf2ac68cd4e4e': resolved conflicts for merge of a314f32b to honeycomb-merge