| commit | 206c7e18d5ef03d78dd0fa4bc11fdae4f503a4b5 | [log] [tgz] |
|---|---|---|
| author | Bo Zhu <bozhu@google.com> | Mon Apr 02 23:42:39 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 02 23:42:39 2018 -0700 |
| tree | 4ba8201b695cee1a450c26b05455501631ecf576 | |
| parent | 7f2e2e0d77c750b2e902de94eba4d5310d9bbb26 [diff] | |
| parent | d4cc378400b5c34c7454e8494c32836fc8062545 [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 am: d4cc378400 Change-Id: I9610319daa1a4cb728470283992c152d95926383