merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 3 Mar 2011 22:17:40 +0000 (14:17 -0800)]

Trivial merge