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

Trivial merge