diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-04 11:44:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 11:44:07 +0000 |
| commit | 3a780c3da8edf4c9e344ea0cf184c6b857ea972c (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b685320ebab7fd6adfd9d20962aefa11f280ca02 (diff) | |
| parent | fa7b8d4a7aec0366826dd871e9cb3b493e8e4a27 (diff) | |
[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c0137794d am: 452d7391a7 -s ours am: 854710d0f3 -s ours am: fa7b8d4a7a -s ours
am skip reason: Change-Id Id06b2013ef5fdeadf321f14f8b611c733031d54d with SHA-1 f21c885ca7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12287404
Change-Id: Ia2d79a0104c8e4013b7cfdf1ad8ccd80555f751c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions