diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 20:19:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 20:19:06 +0000 |
| commit | 86ed339ccc271bc232260fb2d0acbb2b8fac88ca (patch) | |
| tree | 6da1311abc5b9539ea69a07be5cb98d02d4b7a25 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8cf0b9632792cf398df2de04a5c191b63e53e841 (diff) | |
| parent | 4bd029298ad0b546c7d70a71c94844ed59336994 (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -s ours am: 4bd029298a -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: I9ddd5adc7570c763285c99c673de221d912bbc38
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions