diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 22:42:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 22:42:49 +0000 |
| commit | 50c77976376dfcde681a435414dbee9414bba617 (patch) | |
| tree | 73f1aaad63da1c0a61d68bd6223240759cdeaa98 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a540241260c445ff971f9966b144520af2ac8381 (diff) | |
| parent | 7162d024b22432733be3d3960a6ca01c8da9172d (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 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: Ia7b043f41c17732d468dc64daa819d978d1e2650
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions