tree 65c72a4036595fe03379b499bca2b7307551c5b0
parent 3dc955e26d02bcf4071d01c870df062e98d940a7
parent 40379b21d8f16d8dd346ec291b3c24f84c62d291
author The Android Open Source Project <initial-contribution@android.com> 1296420113 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1296420113 -0800

Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ieebdf58d5e72d1f2903aaacbbd1940636a21975e