diff options
| author | Charles Chen <charlesccchen@google.com> | 2020-09-29 07:30:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-29 07:30:32 +0000 |
| commit | 2bebe50bc4773b63d0f7f50a0ea0787d2506e19d (patch) | |
| tree | ac8039487b75b6a88f13b5720ad1771564f91937 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c344dbe754fc98d71262678a83bf0a68a593cf03 (diff) | |
| parent | b7c6009b0537272f35d9e8529918c2ae584d3282 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: 2804a393e2 am: 3c5a186dbb am: b7c6009b05 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107
Change-Id: I722718cceaa69df68670be70a5ab4093123b707d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions