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 03:36:36 +0000 (20:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 03:36:36 +0000 (20:36 -0700)
commitd4cc378400b5c34c7454e8494c32836fc8062545
tree7804e923599f4c94d67a6260ac2e94d32fb689f0
parent6f1119a090e23cca3acbf0db49bb7d2523eea491
parent1364455fd77916d07ae3b6a48d90a9e23f88392d
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
core/jni/AndroidRuntime.cpp