| commit | 47f97471a2b4148a4aedb279a490317b9c0aaf38 | [log] [tgz] |
|---|---|---|
| author | Himanshu Rawat <rwt@google.com> | Tue Aug 02 02:18:24 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 02 02:18:24 2022 +0000 |
| tree | 75c9d7ac3b2a2f25ec07106d9da8629dd07dd745 | |
| parent | 225958b5b9321d3ede5a1ffd8bcd4ddb68344992 [diff] | |
| parent | 27ce614bf220cb67ad6f9204ffaf239dbe5beb00 [diff] |
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: 27ce614bf2 -s ours am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423969 Change-Id: I06b25f57987d0fe989e685058728574e9146f3d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>