summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Script.java
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-07-29 22:16:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 22:16:26 +0000
commit38ea797860960477bce5d3e73b7d351f436d7090 (patch)
tree0414a5ed1af57255f477c54c1d2beef4043eef82 /rs/java/android/renderscript/Script.java
parenta4bfc36c558643ab25c5dae1622d9b476e5dc8b4 (diff)
parentbb8326d0cc1a15d7f78978d28646708eac107a2d (diff)
am bb8326d0: am f03ad443: am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit 'bb8326d0cc1a15d7f78978d28646708eac107a2d': Fix pattern lock for accessibility
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions