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