merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 17 Mar 2011 12:44:06 +0000 (05:44 -0700)]

Trivial merge