merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 12:43:50 +0000 (05:43 -0700)]

Trivial merge