diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-16 20:20:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 20:20:15 +0000 |
| commit | b1aa7d0bc821614d943075c0d786cc3f5eeb8c73 (patch) | |
| tree | 776ac8092fb497ee8092a20c53a51c80a566ea57 /keystore/java/android/security/AndroidKeyStore.java | |
| parent | 186fe7b10f475fdccb3bcab19461bd2900347b71 (diff) | |
| parent | 51884f0e066bcf1ba5e039cd8a24a87139b5a01c (diff) | |
am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."
* commit '51884f0e066bcf1ba5e039cd8a24a87139b5a01c':
Add Keymaster KM_ORIGIN_UNKNOWN constant.
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions