Skip to content
Commit 59adf04a authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 7e8c613f: (-s ours) Reconcile with jb-mr0-release - do not merge 

* commit '7e8c613f':
  DO NOT MERGE - Full (local) restore security changes
parents aa64b110 7e8c613f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment