am 666fbc3b: Reconcile gingerbread-plus-aosp and honeycomb
* commit '666fbc3b39aabfb2ff5cfe54acb33f07572f17dd':
This commit is contained in:
committed by
Android Git Automerger
commit
65a105b962