[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: 39d75b0e54 -s ours

Browse Source

am skip reason: Change-Id If5cdf8ffaf3aa7d8a1ac81272e3bfb2cc7cdddf1 with SHA-1 d4774f9101 is in history

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

Change-Id: I0da8b2d1557b10ca8d60e0f0a57f28bfc0bce9a0

...

This commit is contained in:

Curtis Belmonte

2020-11-10 00:16:18 +00:00

committed by Automerger Merge Worker

parent 0738b20f0e 39d75b0e54

commit a89fc49936

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available