am b2b10f9a: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'b2b10f9ad814574a3559ff2d32cbe2d173d14aab':
This commit is contained in:
The Android Open Source Project 2012-10-31 09:23:32 -07:00 committed by Android Git Automerger
commit c2cf819fe9

Diff content is not available