diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 19:19:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 19:19:20 +0000 |
| commit | 6db47d2d5870b6122658d2f8fb6fbb8738e44a61 (patch) | |
| tree | 73f1aaad63da1c0a61d68bd6223240759cdeaa98 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0122320cb2a8123c470d2b672f958e9ebd2ce9eb (diff) | |
| parent | 47d2f291e3fdd9f29fcb389e42eb9841d98afa0b (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358518
Change-Id: I31df5dd17183ecaf75a8ee8c0a64b201dc29992b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions