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

Trivial merge