diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 03:16:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 03:16:54 +0000 |
commit | 5d4cad98acbf780d7c6b94df613eb186e3c5d00e (patch) | |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ffe7d2fbba55acc1c9e98a8a9f0fd30e5fb56d70 (diff) | |
parent | 5c0818d397ade61fa35e8cf1e34b9d311a5152d5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 43a1b4cac2 -s ours am: 0d0783929a -s ours am: 5c0818d397 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420491
Change-Id: Ib421113df3f3699b4e79f6129027947f81ea6d39
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions