| commit | 1364455fd77916d07ae3b6a48d90a9e23f88392d | [log] [tgz] |
|---|---|---|
| author | Bo Zhu <bozhu@google.com> | Tue Apr 03 00:28:43 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 03 00:28:43 2018 +0000 |
| tree | 354a6c45581dd787cbf0bc5d3ab386bb2447cfc3 | |
| parent | 943b315668d0faa54cbd496175a0e335d433c872 [diff] | |
| parent | 09856135e35c069bab58e7487ccfc733b9a6811c [diff] |
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev