Reconcile with gingerbread-mr4-release

Change-Id: I4306273ad563fc15e0d620fc420acf26171d9a4a
This commit is contained in:
The Android Open Source Project 2011-07-21 07:24:01 -07:00
commit 6988e16f23

Diff Content Not Available