tree 5340dd965e9b55df7c431748fcafa4f20eaadf31
parent 6fe9a20fb9fbf8e59912e5f75051934b1bfb4059
parent bf838a662e1bd2c5e4af6a9dd3c37625be020fdd
author The Android Open Source Project <initial-contribution@android.com> 1296420940 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296420940 -0800

am bf838a66: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'bf838a662e1bd2c5e4af6a9dd3c37625be020fdd':