tree 3dc7739857e10e79dfd1080b958c8e89ef9cd835
parent 88436b70e9c9fda1f1a8529aee7af2deea35df63
parent ab65378dfb6a232de9c0bd64c780eb31ce3e8da7
author The Android Open Source Project <initial-contribution@android.com> 1296420199 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1296420199 -0800

Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I32c18a45ce3403072e6f917a370f3b1a7212ae59