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