summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-09 01:16:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-09 01:16:38 +0000
commitada3e01313b3d395ee31918fb004b4afed5769be (patch)
tree135835cc5c138a8dd6b0ec0a304a6a25cf495db1 /rs/java/android/renderscript/RenderScript.java
parent295a93b99f1773638553a0d00898824dc7ba79e5 (diff)
parent2d81cb6824e186a6c76d0466e2d58eaa34312673 (diff)
am 2d81cb68: am 2cb1e1dc: am 1da3d7fc: Merge "Add more digests to AndroidKeyStore API."
* commit '2d81cb6824e186a6c76d0466e2d58eaa34312673': Add more digests to AndroidKeyStore API.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions