tree 105b62fc3f9d6622ebff42ebab23da8324ce7e93
parent aa64b11020c5283509c7ef37ecfe274a4f6b45f4
parent 7e8c613f823b382ecc7cab843e2920aa5dd05447
author The Android Open Source Project <initial-contribution@android.com> 1348862314 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348862314 -0700

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

* commit '7e8c613f823b382ecc7cab843e2920aa5dd05447':
  DO NOT MERGE - Full (local) restore security changes