merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 24 Mar 2011 15:48:57 +0000 (08:48 -0700)]

Trivial merge