diff options
author | Baligh Uddin <baligh@google.com> | 2016-06-08 13:10:46 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 13:10:46 +0000 |
commit | 5b96cafec832787b2780c200457ef075fcde013d (patch) | |
tree | 0b7a7fc0a6ebc1618d4c0d46a1d0aa2d3db8e2a9 /rs/java/android/renderscript/RenderScript.java | |
parent | 26e9a5c9f858b0a2ca5763424d027c9c25354fd6 (diff) | |
parent | e573989e059d6d2db7047e23bf992f1b153ebdc4 (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: e573989e05 -s ours
Change-Id: Ia70e5266178ab687bac8299f6609825b54787b3c
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions