Reconcile with gingerbread-release

Change-Id: I3cb3d915837ebe59c2d7007d71ef3a1f334e9b8b
This commit is contained in:
The Android Open Source Project 2011-07-07 15:22:42 -07:00
commit 5283052272

Diff content is not available