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