merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 25 Mar 2011 21:32:01 +0000 (14:32 -0700)]

Trivial merge