diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 22:57:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 22:57:58 +0000 |
| commit | 0fe296d67715191043ddd6a50895baec14c3c38f (patch) | |
| tree | aad7307ab2b58c058c6cc74ed0202eb614e35e48 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cd5bad24805a1a34b0b3c22f2f0cf320d2564821 (diff) | |
| parent | 50c77976376dfcde681a435414dbee9414bba617 (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 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: Ia67b2944593244b543ac1a6b1a79756a54721e01
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions