tree f1d846a828c1221ddc9300f0348b3614b51c8a64
parent cb0f4ff0f89719547d8364c3bfa86f14c6849efb
parent 8679c4d8ff78a460d70dd99fea2304a673d4af26
author The Android Open Source Project <initial-contribution@android.com> 1296420118 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1296420118 -0800

Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I048900235e7de3f5be0f0ede44cd6793874cf18f