diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:50:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:50:36 +0000 |
| commit | 5b2c94e15786cb6ec0414a2114b00a669abfe98f (patch) | |
| tree | 56d3ef20aab2fa3ce7b547cfd89fc0ce0e10501f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 777b7e25b07fb66b19abe75d9669c787d1b6ee18 (diff) | |
| parent | c6bc849b33fb9777636ad931c71cd27338298799 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 83378cb136 -s ours
am: c6bc849b33 -s ours
* commit 'c6bc849b33fb9777636ad931c71cd27338298799':
Import translations. DO NOT MERGE
Change-Id: I4f446ef8565ebaa75b8a1fabcacc3cf993aa7f83
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
