summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-04-15 17:59:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-15 17:59:41 +0000
commit1cb119d3f0945f2194d400b7f186df92bbb25567 (patch)
tree7b1df532f373ad74d3b49bda3b6a0dba5571d937 /rs/java/android/renderscript/RenderScript.java
parent99e23088843eddede29d0fc5ca30a83f147f31b0 (diff)
parent71ba4e461f7a492b44632e282e6480345ac4b9c8 (diff)
am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."
* commit '71ba4e461f7a492b44632e282e6480345ac4b9c8': Unbreak obtaining symmetric keys from AndroidKeyStore.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions