merge in honeycomb-mr2-release history after reset to honeycomb-mr2

This commit is contained in:
The Android Automerger 2011-06-15 15:19:53 -07:00
commit 87782850de

Diff content is not available