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:
The Android Open Source Project
2012-09-28 12:58:34 -07:00
committed by Android Git Automerger

Diff Content Not Available