commit | fb26500d05345eb6c94861d262bbbb4db52403ef | [log] [tgz] |
---|---|---|
author | Robin Lee <rgl@google.com> | Fri Sep 26 20:51:15 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 20:51:15 2014 +0000 |
tree | f0da7417d811f84e0a2414b80c79661e660a22f4 | |
parent | d91418f7961cb0b9db050aa35f934c729c61437d [diff] | |
parent | 90c4779146c9ac154fe85cd6a0775f8e1fc29be8 [diff] |
am 90c47791: Merge "Delete user\'s keys only after keystore reset" into lmp-dev * commit '90c4779146c9ac154fe85cd6a0775f8e1fc29be8': Delete user's keys only after keystore reset