diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 23:34:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:34:48 +0000 |
| commit | 2fe09420a34f6c3cfc7f280ed8e96ca62e03807c (patch) | |
| tree | bbcc46754da98d23cfcd639e67a9b651b71e6aad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 98f71be4d72b988b5fdbdaec134495a5daae62fd (diff) | |
| parent | 7d6482b4b1a0eddbd4deb54fd7d6aed6fcf958e2 (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 3806a2a28f -s ours am: 7d6482b4b1 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I5f96e1d0cf0eff8ddae0b3e08e312d4786b73344
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions