tree b9f6ae549939e365cdaa9cdc8e1444bd7b56835f
parent 292c75a05a57b8f2021167ca4ffc165a45e11348
parent a82898ba3468afbc3fdfb38cb49250afcf3a0d93
author Curtis Belmonte <curtislb@google.com> 1604964724 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604964724 +0000

[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours am: 8df04e3975 -s ours am: dc9d907b8f -s ours am: a82898ba34 -s ours

am skip reason: Change-Id Iee6af379515385777984da55048c1efd9339ed88 with SHA-1 be924dac10 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177

Change-Id: Ieff512e47fafd18db45bda0a651e8b096e0460fa