merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 12:44:09 +0000 (05:44 -0700)]

Trivial merge