diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:49:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:49:55 +0000 |
commit | a5be4dd6fab55d8fb0c77ca16da5fde33af24332 (patch) | |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6b872d3a57efa2658331745c4fd6ea24cc3a8c1b (diff) | |
parent | f50ee3be17624a99ee330f5238247f77e519e680 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 83d5c6736f -s ours am: 573559b776 -s ours am: 4df50ef788 -s ours am: f50ee3be17 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420267
Change-Id: Ia7a06392c60924fc3d5e4e07e2692fb85ffffba9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions