Reconcile with gingerbread-release

Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b
This commit is contained in:
The Android Open Source Project 2011-07-18 08:10:06 -07:00
commit 942b900566

Diff Content Not Available