| commit | d4cc378400b5c34c7454e8494c32836fc8062545 | [log] [tgz] |
|---|---|---|
| author | Bo Zhu <bozhu@google.com> | Mon Apr 02 20:36:36 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 02 20:36:36 2018 -0700 |
| tree | 7804e923599f4c94d67a6260ac2e94d32fb689f0 | |
| parent | 6f1119a090e23cca3acbf0db49bb7d2523eea491 [diff] | |
| parent | 1364455fd77916d07ae3b6a48d90a9e23f88392d [diff] |
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev am: 1364455fd7 Change-Id: I6fc53616ec67bbb2770541958745d10f766f8b3d