am 9f0fe782: Reconcile gingerbread-plus-aosp and honeycomb

* commit '9f0fe782e5205524348c6770a90dacfd9be71e2d':