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

This commit is contained in:
The Android Automerger 2011-06-02 07:10:40 -07:00
commit ce9e3ee81b

Diff content is not available