merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 26 Mar 2011 05:25:36 +0000 (22:25 -0700)]

Trivial merge