merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 12 Mar 2011 19:56:13 +0000 (11:56 -0800)]

Trivial merge