OSDN Git Service

Merge "Expose the JNI scrypt function in a standalone Java class so we can use it...
authorBo Zhu <bozhu@google.com>
Tue, 3 Apr 2018 06:42:39 +0000 (23:42 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 06:42:39 +0000 (23:42 -0700)
commit206c7e18d5ef03d78dd0fa4bc11fdae4f503a4b5
tree4ba8201b695cee1a450c26b05455501631ecf576
parent7f2e2e0d77c750b2e902de94eba4d5310d9bbb26
parentd4cc378400b5c34c7454e8494c32836fc8062545
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