tree 316b0e92f65b6fe83036eefce65db14bf9c238b3
parent 3c5df37a2df7368eb274eb097e9cfa2ccc7fffb6
parent 01025db4992639d453b5f70ea17efd1c189a884d
author The Android Open Source Project <initial-contribution@android.com> 1296426488 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296426488 -0800

am 01025db4: am d820da20: Reconcile gingerbread-plus-aosp and honeycomb

* commit '01025db4992639d453b5f70ea17efd1c189a884d':