summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-03-05 00:51:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-05 00:51:33 +0000
commit1d13f13deac644bddbae8a1f92642074a32d7a6c (patch)
tree12ce3622ba1d2cb4495e280b6c94df2a05ba223f /rs/java/android/renderscript/RenderScript.java
parent1e995c76485f8a7477177886890b834c31e8d1a6 (diff)
parent28c8cfd7624902bbd72cb021fe000e0a8c818aab (diff)
Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions