| commit | b132484ead29c6bb975d8196fe4ffe1242a478ce | [log] [tgz] |
|---|---|---|
| author | Himanshu Rawat <rwt@google.com> | Tue Aug 09 07:31:06 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 09 07:31:06 2022 +0000 |
| tree | 5647c3e2c3c20f832bb42f0aae14f7033ec3545f | |
| parent | 8e5f1b5b74e55e781845d6c766626319fd9263a8 [diff] | |
| parent | 12705de9c8804a1110a54b0955af9fc4dd48d2cf [diff] |
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651 Change-Id: I51e6b4fc0193135ccfc03192df2ac7d17f062609 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>