tree 9bd098d9933900ed08d55139cad59843d74a94b1
parent 04b851242cd7b5b4b8d1f1b1fb8bfc0746397c8a
parent ba55846fdef74e82ec589f4aecbe38c032baca78
author Dmitry Dementyev <dementyev@google.com> 1605138550 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605138550 +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 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: I0b13d9220a4d94977df90e20d96ec9ed59d9b8bc