summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-11 23:17:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-11-11 23:17:32 +0000
commit94317f5b8d16ed0d45663054666b9f1ff1cd1d5f (patch)
tree4c727d218ba17232f4dba12ab04bab4a1bfa69e5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent90068cf6278abec49a1413d29b8e6680a575b56f (diff)
parent1efe5d80cdb537ec108d0faf9f5aef7a929c4669 (diff)
Merge "[automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours am: 1d3ca59a19 -s ours"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions