am 666fbc3b: Reconcile gingerbread-plus-aosp and honeycomb

* commit '666fbc3b39aabfb2ff5cfe54acb33f07572f17dd':
This commit is contained in:
The Android Open Source Project
2011-01-30 12:55:37 -08:00
committed by Android Git Automerger

Diff Content Not Available