Reconcile with gingerbread-release

Change-Id: Ic4aca5ef26cbfb97281582ddb6bfe290f60c29fc
This commit is contained in:
The Android Open Source Project 2011-06-24 08:08:40 -07:00
commit a9883eaf23

Diff Content Not Available