merge in gingerbread-release history after reset to gingerbread

This commit is contained in:
The Android Automerger 2011-05-25 16:13:56 -07:00
commit cc8480c544

Diff Content Not Available