| commit | e37478c4ebbe6e95ef3904b9f2fa0e93e1b258ac | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Mar 21 16:07:11 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 21 16:07:11 2013 -0700 |
| tree | 67283a16d7d176eb569abda66d7a4d91bf89228f | |
| parent | 116e56cdf4bf408bfa3e7f70efc325a2a9f4010b [diff] | |
| parent | 9d262c49d96de4d896594bfcf00ece873f1abb7f [diff] |
am 9d262c49: am f6c4dba2: Merge "KeyStore: change migrate to duplicate" * commit '9d262c49d96de4d896594bfcf00ece873f1abb7f': KeyStore: change migrate to duplicate