merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 25 Mar 2011 13:04:31 +0000 (06:04 -0700)]

Trivial merge