diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 23:34:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:34:39 +0000 |
| commit | 5656402f58fb3b164d85cfc8bebae9522205d518 (patch) | |
| tree | bbcc46754da98d23cfcd639e67a9b651b71e6aad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 57244b6ebbfbe39bc7fa80de3d90d937a33beac9 (diff) | |
| parent | eb8b442022e9bc730ffd9840fdaeca09107cf979 (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: 671263bccd -s ours am: eb8b442022 -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: Ie4777896fe84abeb7369ee14a83b28f512728b90
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions