am 8cbb869a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '8cbb869a0724a2522cf25712950da70459acb673':
This commit is contained in:
committed by
Android Git Automerger
commit
bf2920e3ab