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

Trivial merge