diff options
author | Bill Yi <byi@google.com> | 2017-07-13 15:39:12 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-13 15:39:12 +0000 |
commit | b7d1a1fdc7be8cad5bde6b05236aa4614bd6c729 (patch) | |
tree | f27993ec6c71e27f402c6f9d9067fa20cfe22907 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6d626acdbf395fd34cabb2cd30bb1ce52770d42d (diff) | |
parent | 482b2c3b12f9ca779f641eb7dbddab093096f6a0 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 482b2c3b12 -s ours
Change-Id: I943722c47109b65dee52ad67292b14ec53074a24
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions