am 5270e840: Reconcile gingerbread-plus-aosp and honeycomb

* commit '5270e8408cc59774ac7cd6e2f0349fa7038bf7d0':
This commit is contained in:
The Android Open Source Project 2011-01-30 12:54:19 -08:00 committed by Android Git Automerger
commit df13c41d1f

Diff Content Not Available