summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-03-28 05:11:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-28 05:11:02 +0000
commit1bca3532687675d81dea805b12577a6c3a00b4c3 (patch)
treec9e0aec43035179c5603751af25dcd5e0db05464 /rs/java/android/renderscript/RenderScript.java
parent23c2b8e81ec5a6e0c344f09e728d87300ac29bc2 (diff)
parent0e6b4da5ca53d338f351827f7a351edcd6281aaa (diff)
am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '0e6b4da5ca53d338f351827f7a351edcd6281aaa': Frameworks/base: Fix request removal in VoiceInteractionSession
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions