tree 4f54b9dab58679d803a9f575be246183efb3ae36
parent 43fce46bcd2f77cbcf53fcb8d64d16b3eb92da2a
parent 03dd82792e41ed76602ca5f2ea32446da741c737
author TreeHugger Robot <treehugger-gerrit@google.com> 1514427415 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1514427415 +0000

Merge changes from topics "wrapped_key_import", "keystore_seclevels"

* changes:
  Add importWrappedKey to IKeystoreService.aidl
  Keystore: Use security levels