| commit | 57ac383a3d2596037a31daa9a26b72af696809ae | [log] [tgz] |
|---|---|---|
| author | Curtis Belmonte <curtislb@google.com> | Mon Nov 09 23:44:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 09 23:44:15 2020 +0000 |
| tree | b47c311bbc29c4fdd301d1cc96d797b28e1fdede | |
| parent | a82898ba3468afbc3fdfb38cb49250afcf3a0d93 [diff] | |
| parent | 8fcc7fb7627b0620327f75e7bd5fe0c1dee06623 [diff] |
[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768751 Change-Id: I12dc08b1a15db4f602d533f42cc3769c6db11186