diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-19 20:45:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-19 20:45:39 +0000 |
| commit | 04cf1c50e3545722bb4916b1c1f317aff0440feb (patch) | |
| tree | 13fdc63672560d3f84d22d08eb98e1d7c542e41d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8c2e1bedd84ae6ee4a2ca6def9b22d0eace9338b (diff) | |
| parent | 45d83c2145c7ded41b08e9443cb7e224bf833115 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4d5 am: 45d83c2145 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011
Change-Id: I36519036f681d46d889c6bfff5c82ae900fbe166
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions