am 0b316d1a: Reconcile with gingerbread-mr4-release

* commit '0b316d1a2d83cb7d64461249ac854d3a7c1c72ce':
This commit is contained in:
The Android Open Source Project
2011-09-14 07:24:40 -07:00
committed by Android Git Automerger

Diff Content Not Available