am a4a9820f: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'a4a9820f373792a760356ae19117f29ef7145352':
This commit is contained in:
committed by
Android Git Automerger
commit
8bb46bec8b