merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 13 May 2011 21:27:36 +0000 (14:27 -0700)]

Trivial merge