Reconcile with gingerbread-release

Change-Id: I4b6c483135fc0cb50e6de6c2fde845842c29e25c
This commit is contained in:
The Android Open Source Project 2011-09-12 07:46:51 -07:00
commit f085ea2aa5

Diff Content Not Available