merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 19 Mar 2011 00:35:47 +0000 (17:35 -0700)]

Trivial merge