diff options
| author | Bill Yi <byi@google.com> | 2017-07-13 16:06:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-13 16:06:11 +0000 |
| commit | ff5416e5dc4c336473ce2d3bbc5e75089c0740ae (patch) | |
| tree | f27993ec6c71e27f402c6f9d9067fa20cfe22907 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b7d1a1fdc7be8cad5bde6b05236aa4614bd6c729 (diff) | |
| parent | 4c44a3059c41c5ae95d40be2a4514198e9bbc435 (diff) | |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4c44a3059c -s ours
Change-Id: I0474490ef308e2df768be086ad76e8aae671891d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions