Reconcile with gingerbread-release

Change-Id: I6cdfd6015906695c20b6249783d32ccf2e322acd
main
The Android Open Source Project 2011-05-20 14:14:48 -07:00
commit e66f374554

Diff Content Not Available