summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2016-06-08 13:10:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-08 13:10:44 +0000
commit26e9a5c9f858b0a2ca5763424d027c9c25354fd6 (patch)
tree0b7a7fc0a6ebc1618d4c0d46a1d0aa2d3db8e2a9 /rs/java/android/renderscript/RenderScript.java
parent25ad61262e37781df3180f28582d596e7d4766dc (diff)
parentc20ea2eb438a47bc0590f046d5765ad3b32b80c7 (diff)
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: c20ea2eb43 -s ours Change-Id: Ide205acdf26a282bd80ca2eb68b23f1a442c36a4
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions