| commit | f77c9eff7244ba7aa50150972508b6983039e9a7 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Wed Oct 29 07:00:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:00:36 2014 +0000 |
| tree | ed3309220f8de14057fbb64ce1fd57e423076a3b | |
| parent | 57c61ddc0ce9709a962f9d9026b47246a47f7406 [diff] | |
| parent | 50ad778dc24adbd2cb9c79ed4bf312b9fff17865 [diff] |
am 50ad778d: am 90c47791: Merge "Delete user\'s keys only after keystore reset" into lmp-dev * commit '50ad778dc24adbd2cb9c79ed4bf312b9fff17865':