diff options
| author | Charles Chen <charlesccchen@google.com> | 2020-10-19 20:45:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-19 20:45:27 +0000 |
| commit | 8c2e1bedd84ae6ee4a2ca6def9b22d0eace9338b (patch) | |
| tree | 13fdc63672560d3f84d22d08eb98e1d7c542e41d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | edd637de8d8aea3802cde35a1367c4f94ea3793a (diff) | |
| parent | f229afe6481a0eb6eae711ee59be1baddf9f346a (diff) | |
[automerger skipped] [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" am: c947b10f99 am: f229afe648 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011
Change-Id: I9ccb118afd43c00affe73b3087b0275392a1d0c3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions