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