merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 11 Mar 2011 18:35:23 +0000 (10:35 -0800)]

Trivial merge