diff options
author | Bill Yi <byi@google.com> | 2016-05-31 04:48:25 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 04:48:25 +0000 |
commit | f35dcdb530d4e490770faf588c63dcff3f879b45 (patch) | |
tree | 687e02d8a9bb297aae5957def4159c5e97df0f16 /rs/java/android/renderscript/RenderScript.java | |
parent | f3dfa54f79a994e002b2133a4f1029fa37d0cef9 (diff) | |
parent | e71cdef7e307aff6326a5790d98a044bdfcec84c (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: e71cdef7e3 -s ours
* commit 'e71cdef7e307aff6326a5790d98a044bdfcec84c':
Import translations. DO NOT MERGE
Change-Id: I17af720d1549bc29d2f8a823d529d2d9429671ee
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions