diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 19:48:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 19:48:35 +0000 |
| commit | 4b8f7a79914a3d1e35b2f239ac0de29c089e771d (patch) | |
| tree | 162213fb74a9f0e57456bf960cbe23403f523a35 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 262de4fb4f132ad77d3bf347547e1595aa91d831 (diff) | |
| parent | 5a382b69154665e5c67f8869a29f43a664223dad (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519
Change-Id: If2aedea5dd07a0934d4de73ec429e0245e795ef0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions