diff options
| author | Christian Wailes <chriswailes@google.com> | 2020-08-06 13:47:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 13:47:02 +0000 |
| commit | e1ff28ffc0e684723252a9668ecc587410175984 (patch) | |
| tree | 6443be95baab2c7610484ef033ccbba76e7a05d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9520ff93711dd18de5114da9959e5cd444040d54 (diff) | |
| parent | fcc9e753e7341bbb45e533a873595ceaf8a5ed7b (diff) | |
[automerger skipped] Merge "Rename blacklist to denylist" am: 0f2d849c39 am: c044cd9bb1 -s ours am: c82b42a599 -s ours am: 5e0437a1b5 -s ours am: fcc9e753e7 -s ours
am skip reason: Change-Id If8bb7c923f1ce8d8ce8c3142bf1b674982a96573 with SHA-1 b656b9540a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379680
Change-Id: I4f23980de0c102ebbca04d8b8db117762592c8d3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions