tree 884167f03987e592389fcce8669d06b82d9479d1
parent ddd49dce06d7ce7a00cbfb785cd7cac66181ff43
parent 27a3733949d08a4ed33f25f6a09f7f3af0b34fef
author Curtis Belmonte <curtislb@google.com> 1604965274 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604965274 +0000

[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-dev am: 5f94201861 -s ours am: e1192c36bb -s ours am: dbf3ed5aa6 -s ours am: 292c75a05a -s ours am: 27a3733949 -s ours

am skip reason: Change-Id I9b242a9fee0acbfb430875061e2d809c00fe4b97 with SHA-1 ce0a50bcde is in history

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

Change-Id: If7bbaaeac804d11272405511580224a06a318b32