diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:11:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:11:59 +0000 |
| commit | b0cd3fe53e796a200d76c74e98b7812eb9dc27ca (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 677e33de59ad3f0f8ea5cf50417fab992ee50e93 (diff) | |
| parent | d8bbffa13389982fabeef36b928482b639567150 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8d9e8ba822 -s ours am: 47c1d3f7a8 -s ours am: 89a0cae9f9 -s ours am: d8bbffa133 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420421
Change-Id: Idef16287266154e9fff5e94e18903b37ba1d1e9c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions