diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 19:48:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 19:48:08 +0000 |
| commit | dab83653331bde6ae5183b5a51a61b793cb97b0a (patch) | |
| tree | de77466a6fc5ecb28cecbf63d1a2fcf583386aa1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | be89b2aa43213e8497bd66d509891e0fdeca8d7b (diff) | |
| parent | 804799ae8a83535f9219145d9d41f3a6a0101b62 (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -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: Ia4ff6e30e2563161e5746e3a649dfcbf5945842c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions