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

This commit is contained in:
The Android Automerger 2011-06-07 15:30:05 -07:00
commit 4835d110ae

Diff Content Not Available