summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Script.java
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-03-27 23:26:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-27 23:26:08 +0000
commitd7e0610477b1a97ce6b566a19e1fe9246bc30f52 (patch)
treeb9edcc0ea7d0bc6553327aa97720ef93284678d7 /rs/java/android/renderscript/Script.java
parent3e89fac56966fc30790430f128887a987fea63d8 (diff)
parent36ee836d2f6e6df59d6a20a69421639bacf25559 (diff)
am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '36ee836d2f6e6df59d6a20a69421639bacf25559': Symmetric key generation for AndroidKeyStore.
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions