am 977e0cb4: Reconcile gingerbread-plus-aosp and honeycomb

* commit '977e0cb4d378368a655b39157161218f0ce5c078':
This commit is contained in:
The Android Open Source Project 2011-01-30 12:53:48 -08:00 committed by Android Git Automerger
commit 727c443a27

Diff Content Not Available