tree 32be072ff1ebac35704c3be91b35bd3123985473
parent c790cbb8e66431b49a860b9a361b28d4ddbf96d0
parent 98d40c621e8d6fa1053287cbe4aaa7cb8407de64
author Curtis Belmonte <curtislb@google.com> 1604964728 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604964728 +0000

[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-qpr1-dev am: f228451841 -s ours am: fc7b7755ca -s ours am: 98d40c621e -s ours

am skip reason: Change-Id I1241a12eafa0bdbac59a8ddd4cf6a0637d467b19 with SHA-1 1ba154b14d is in history

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

Change-Id: I4dc22e4744f47a6baf4b74b74edc9eaecc44c7fe