diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-12-28 02:16:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-28 02:16:55 +0000 |
| commit | 7b27036950574a51edd6ade7b3c8d82b950b857a (patch) | |
| tree | 4f54b9dab58679d803a9f575be246183efb3ae36 /tools/aapt2/java/JavaClassGenerator.cpp | |
| 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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions