Commits
The Android Open Source Project authored and Android Git Automerger committed c667cf27979M
am 59adf04a: (-s ours) am 7e8c613f: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '59adf04ab391d5cbfb8d031eff39937aebabade1': DO NOT MERGE - Full (local) restore security changes
Showing diff to59adf04ab39