diff options
author | Dmitry Dementyev <dementyev@google.com> | 2020-11-12 00:23:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-12 00:23:50 +0000 |
commit | 7e97953f40712c58a6c28a4cd8012b5ef61c6e5b (patch) | |
tree | b8ba3c35589ad0040168269a743650312d9061aa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1285511425b29cb49571948b8d1dde41f8fdb65c (diff) | |
parent | 735499e6c71282270649b1788da6cde51a3bfc7d (diff) |
[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: ef729aad20 -s ours am: 96e7f6118f -s ours am: 735499e6c7 -s ours
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13031365
Change-Id: I9c522a0a643353085b6bdb8747c4ccdaa8a5806d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions