tree b8ba3c35589ad0040168269a743650312d9061aa
parent 4c8caf88da242b8e48de82fb2dc8de05c61f436b
parent 802972d8803a6f70b9ed34f01bdf358b769daa9c
author Dmitry Dementyev <dementyev@google.com> 1605140673 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605140673 +0000

[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: ba55846fde -s ours am: 802972d880 -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: I5c0716e49108428c9aafde07d7c10acafef965e6