diff options
| author | Geoff Mendal <mendal@google.com> | 2015-10-21 17:29:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-21 17:29:50 +0000 |
| commit | a246ed2fed3891452943581fdb3b0cea01560faf (patch) | |
| tree | dc77f53e5b185a9b4b3cf5f35dbac281c754f200 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1316161d5a1e7b177ff3ce8dc12bfffaceb84f28 (diff) | |
| parent | adc2faa46fdb3e56da09a90b9e9b15c24d93f10a (diff) | |
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: cd000a2228 -s ours am: a9af8921f1 -s ours
am: adc2faa46f -s ours
* commit 'adc2faa46fdb3e56da09a90b9e9b15c24d93f10a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions