diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:34:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:34:53 +0000 |
| commit | 285f1b264f6f38a3353e52c946409c5b3313a241 (patch) | |
| tree | bbcc46754da98d23cfcd639e67a9b651b71e6aad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2fe09420a34f6c3cfc7f280ed8e96ca62e03807c (diff) | |
| parent | 4d380e273b12505a1f93b21fd067743a4cdaa8de (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: 6ec148e202 -s ours am: 4d380e273b -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: I4c69b95c2652794af6151d0e8c3a0905b171d136
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions