tree 9e7265b27a00de32165766ceba89137d2e75ee6f
parent fec6ba5c8cc3369b43ad38b98ac1fd030f0e2e73
parent 6ab2cabd1941bc20bc595e0dd9b4f1f2edb4a39f
author Rubin Xu <rubinxu@google.com> 1487198259 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487198262 +0000

Merge "Support keys with a secret but no token, which are handled not using Keymaster but in-process crypto."