am 0531d199: Reconcile with jb-mr1-release
* commit '0531d199dca9d70ccfd4642f845de02736ecf87f':
This commit is contained in:
committed by
Android Git Automerger
commit
d8b46b7bc4