tree ff0236eb1d6573a1baf5707eaaf31f5dab1689c9
parent 500d0714e9d1bbe17862db4a69be3c4ad91894f1
parent de3c3f6f1d1f8705c9df10e89a78dfc3c516ff38
author Robin Lee <rgl@google.com> 1411579226 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411579226 +0000

am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev

* commit '0a803fcc2a000985a42072db5b4c9d4917139fcf':
  Reset keystore when user is added or removed