diff options
author | Bill Yi <byi@google.com> | 2019-08-27 01:42:53 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-27 01:42:53 -0700 |
commit | c5890d038ac479872c4f0d6ec2e5fa4e3f12e95b (patch) | |
tree | 42d25adee935b548000b1d111ad8029d90c84da0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 40001a693440a87d4c4b8035596a49f25df5d267 (diff) | |
parent | b7ad07adad60dba1ee2e467c741d586672976a4d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: b7ad07adad -s ours
am skip reason: subject contains skip directive
Change-Id: Ic727e25a1c2975c797a6425fb662d2f5575ad19c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions