Reconcile with gingerbread-release

Change-Id: I31accda200f9a95127e977ecefaa92090e37709d
This commit is contained in:
The Android Open Source Project 2011-06-24 08:08:52 -07:00
commit b0d7edd452

Diff content is not available