Reconcile with gingerbread-release
The Android Open Source Project [Mon, 18 Jul 2011 15:10:20 +0000 (08:10 -0700)]
Change-Id: I3969f6bf099cd7eaff41ff22515de9e9d2c139fb


Trivial merge