am 0b316d1a: Reconcile with gingerbread-mr4-release
* commit '0b316d1a2d83cb7d64461249ac854d3a7c1c72ce':
This commit is contained in:
committed by
Android Git Automerger
commit
0bd23c03e5