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