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

* commit 'b031214a91b428eb6fc7311a3b090ca99ed5237d':
This commit is contained in:
The Android Open Source Project 2012-10-09 07:35:45 -07:00 committed by Android Git Automerger
commit e569bf103c

Diff content is not available