am 4f5ddf03: Reconcile gingerbread-plus-aosp and honeycomb

* commit '4f5ddf036aac6dffba8194055a01957f35bc0285':
main
The Android Open Source Project 2011-01-30 12:56:18 -08:00 committed by Android Git Automerger
commit 84ad529683

Diff Content Not Available