tree e366f62f3f33e52ae8a4bcc728b510dd64cbc5c1
parent 5e285d001ad1e535626943609b97a853a80500e6
parent 7121ffa522b7aac155800643bb5a4298f2125358
author The Android Open Source Project <initial-contribution@android.com> 1296420830 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296420830 -0800

am 7121ffa5: Reconcile gingerbread-plus-aosp and honeycomb

* commit '7121ffa522b7aac155800643bb5a4298f2125358':