tree c0c1434efac7994e39152c293e0ac65ab075af9d
parent c72347f79a308d515d56cbe616e3612220b9f3f7
parent b67c0f56dde08c9064ba48490212571713124184
author Curtis Belmonte <curtislb@google.com> 1604967410 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604967410 +0000

[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-mr1-dev am: 1a673296ae -s ours am: 12e7baaddc -s ours am: 50472c1db2 -s ours am: 8fcc7fb762 -s ours am: 57ac383a3d -s ours am: b67c0f56dd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8be0b700a0e54cc62f4e4411b36d51e01f01a493