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