diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-04 11:14:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 11:14:47 +0000 |
commit | 91507523d04f7624b9a92d47bf2fcbc1d6169857 (patch) | |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 170c66cbe732a7536e1d6eb1f63257454625e3b1 (diff) | |
parent | f3c3d9fa63064aed071eec6f8636f90e798474e2 (diff) |
[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c0137794d am: c0f911ce35 -s ours am: f3c3d9fa63 -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: Ibbe2b40532a5b337a41845e160a7b03a111d2913
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions