summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorTom Taylor <tomtaylor@google.com>2011-11-09 14:34:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-09 14:34:18 +0000
commit81b10fd74ecad65eb9c658cf3881c9c0254351e9 (patch)
treee2e34551e3c326e4601989ce47fef3559ef4dd3b /graphics/java/android/renderscript/RenderScript.java
parentb69ce803837f6cb369c974e028cec1166f213aee (diff)
parent1366c756d28cdbb6c7c07959dfb4c93c81a9539d (diff)
am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d': Add new secure setting for controlling Messaging notifications
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions