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

This commit is contained in:
The Android Automerger 2011-05-17 07:08:42 -07:00
commit 4fa7d334ea

Diff content is not available