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

This commit is contained in:
The Android Automerger 2011-05-16 07:10:58 -07:00
commit 039739b170

Diff Content Not Available