summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2013-04-12 03:59:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-12 03:59:37 +0000
commit5f2f3dfeaffc9350b6913ceaf98e95c9f5dd5852 (patch)
tree218df8d3f1177a52d667b3a3420f5953a15d4cbc /graphics/java/android/renderscript/RenderScript.java
parentc876cc49947332a538d23d28eca25a76b8f33e93 (diff)
parent51e4ece385c6c34d97d5fa2dcc8e3b2c0bae7c22 (diff)
Merge "Fix proxy and IP settings" into jb-mr2-dev
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions