| commit | 1331f07d4400a25b9c8d2d4a1a913150ae05c5f7 | [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 | 2e8a393fe19a343c8aa470ae33f5cc0f64dc44ad | |
| parent | 6ce1c4e6f6c96cee1d799d774e803d048d808834 [diff] | |
| parent | ed5ba112bc2229c68916ada8eb0d783ba66df9e1 [diff] |
am 5f773b9f: Reconcile gingerbread-plus-aosp and honeycomb * commit '5f773b9f72367ed8046df257d20881fd96f86929': resolved conflicts for merge of a314f32b to honeycomb-merge