am 4aed7b07: Reconcile with jb-mr1-release - do not merge
* commit '4aed7b07cf51abe64620936490f3083eabf42cf0':
This commit is contained in:
committed by
Android Git Automerger
commit
669c382344