diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-03 22:01:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:01:42 +0000 |
commit | ca0b62cb3d63789f5a7fd2c4e0d2da099e35dd53 (patch) | |
tree | 5430ad18d04cb520c804f02efe7ded7c8afde45a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 182b5429376915f0ac64791e5028948c190229b3 (diff) | |
parent | ed199955080f1a6d07b99dd49deeb0c7f2def9d7 (diff) |
[automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours am: ed19995508 -s ours
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12171286
Change-Id: I26e673fb1da7c2831b2b6debb85831d46b8161ab
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions