diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:11:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:11:13 +0000 |
| commit | 6ec148e2020d75345e0f9c162a68540980875c22 (patch) | |
| tree | 621d695f37efe93ef3fac63639ad70764b30fd04 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3806a2a28fee3aedc6909d3d3219bfd5ace7e257 (diff) | |
| parent | 0fe296d67715191043ddd6a50895baec14c3c38f (diff) | |
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I1d90bcc705ccbb05ba04d5f3634ee4c25fb546ff
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions