tree d76bfdb4ba28ab45d42f60316a9f7057aba022b3
parent f119af675b77e34e791d3b02cae9401d0fdcfc06
parent 3f91e43eb00764cebfdffb42a3ddcb723ae439e0
author Christopher Tate <ctate@google.com> 1348783328 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348783328 -0700

am 3f91e43e: Merge "Full (local) restore security changes" into jb-mr1-dev

* commit '3f91e43eb00764cebfdffb42a3ddcb723ae439e0':
  Full (local) restore security changes