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