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