diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-16 20:11:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-16 20:11:56 +0000 |
| commit | c919b03988437e604e6e3ecfb16309a9d8122139 (patch) | |
| tree | 4da1b1c46fed023cc38fba026e8fb473c8ca64e5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f7bf294870f21dc09187d80cf6b07201e45ad71a (diff) | |
| parent | b7ce802f3fedd3c9283a2edcca30c368bc9c9599 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4d5 am: 2f7396440e am: 0e0b74cf63 am: b7ce802f3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011
Change-Id: I4b498bc68782ee879488395c9964b57ba838eb20
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions