| commit | 7b27036950574a51edd6ade7b3c8d82b950b857a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Dec 28 02:16:55 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 28 02:16:55 2017 +0000 |
| tree | 4f54b9dab58679d803a9f575be246183efb3ae36 | |
| parent | 43fce46bcd2f77cbcf53fcb8d64d16b3eb92da2a [diff] | |
| parent | 03dd82792e41ed76602ca5f2ea32446da741c737 [diff] |
Merge changes from topics "wrapped_key_import", "keystore_seclevels" * changes: Add importWrappedKey to IKeystoreService.aidl Keystore: Use security levels