diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 21:09:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 21:09:18 +0000 |
| commit | 3250e7416ad401985bf644333160008d50b6fd8e (patch) | |
| tree | 72ed70b402681c1fbb97b86e64c2b80f37ae8f64 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 0c2bfacab1a47f32a57b774db633580fdbf05dcc (diff) | |
| parent | 86ed339ccc271bc232260fb2d0acbb2b8fac88ca (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: 86ed339ccc -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: I443220395a54b1c536278167c7306fea187558d9
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions