diff options
author | Bill Yi <byi@google.com> | 2019-09-25 15:17:28 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 15:17:28 -0700 |
commit | 254132b362a64f28773741ff0e5a3f4ea55b6232 (patch) | |
tree | 06f70919f696d95bda7f712466bfcb36dd1dee7f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a4f119396f33443d47203619cc961359b5d93b0c (diff) | |
parent | eadfdeb249c7b220427d87deb64a6ddaa1740730 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: eadfdeb249 -s ours
am skip reason: subject contains skip directive
Change-Id: I4570da735d4c7bf63c17bd0e8486c884c854d350
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions