tree 32be072ff1ebac35704c3be91b35bd3123985473
parent 41772e6d9537ae912db698505b759fc6f6b9552d
parent ac318c815c8b13f0cd9aa4de8db6ab08344b54ae
author Curtis Belmonte <curtislb@google.com> 1604973028 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604973028 +0000

[automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: bb5706541d am: bfd504c81a -s ours am: efa94e557f -s ours am: 6e185d5cad -s ours am: fd1f963c32 -s ours am: 8f077190bd -s ours am: beda396d64 -s ours am: ac318c815c -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: I5411da1018bcd3a25c8b337317e785734600dda1