tree 7fcab7e7187b0f5ca7c17ad2f6144cffbc657aae
parent ade6a9364da9c62928f0f39256611ad43f2a0279
parent cedee1e6ad05048d871807f1f537da7ce9107002
author The Android Open Source Project <initial-contribution@android.com> 1296420179 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1296420179 -0800

Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ie7a3c6ea5ac54ce6b1b019c95a62030b322921be