| commit | fc480f7f8816ad10281e9107c68c7872daf46a6f | [log] [tgz] |
|---|---|---|
| author | Curtis Belmonte <curtislb@google.com> | Tue Nov 10 01:51:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 10 01:51:14 2020 +0000 |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d | |
| parent | 7a9df75a4476d4b247c1f9683c544ec306db2468 [diff] | |
| parent | fb7ce33912b058a7d9898c532ab48ee92aeb161c [diff] |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours am: e65d59eb5f -s ours am: fb7ce33912 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285 Change-Id: I9dab19c39c99605d111e5630eefef54a8f5fc015