diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-05 19:12:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-05 19:12:58 +0000 |
commit | 40f09f54ec887c118c16085378ac55a971e9b54e (patch) | |
tree | 49c86e38d3f71347af6c627653ddb5b55b0344ff | |
parent | 5667640792931ecf15b72a6f22e69d3df02a7a9d (diff) | |
parent | 2b178f789689929173288e06c6d88d9b891b483e (diff) | |
download | bt-40f09f54ec887c118c16085378ac55a971e9b54e.tar.gz |
[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into pi-dev am: 2b178f7896 -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 cd3398b4e2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12307728
Change-Id: I8984a13c5abda90c0820798e8433e2cd8efb5f7a
0 files changed, 0 insertions, 0 deletions