tree 884167f03987e592389fcce8669d06b82d9479d1
parent 9ef738a47561aabbc453837d54111e6a59b61715
parent 94fc18f36cd7c717ce74f5acc9c618abe150446b
author Curtis Belmonte <curtislb@google.com> 1604975835 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604975835 +0000

[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours am: e65d59eb5f -s ours am: 343b788472 -s ours am: 94fc18f36c -s ours

am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history

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

Change-Id: I48ccbd2f55c821a0437ed393e4b3c9fc53716980