am 7e8c613f: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '7e8c613f823b382ecc7cab843e2920aa5dd05447': DO NOT MERGE - Full (local) restore security changes
This commit is contained in:
committed by
Android Git Automerger
commit
59adf04ab3