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)
am: d4cc378400

Change-Id: I9610319daa1a4cb728470283992c152d95926383


Trivial merge