merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 18 Mar 2011 17:42:08 +0000 (10:42 -0700)]

Trivial merge