diff options
author | Rahul Sabnis <rahulsabnis@google.com> | 2020-08-05 22:14:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-05 22:14:51 +0000 |
commit | 2f1a14d58ee0911d51ac58a556387228ecce25d0 (patch) | |
tree | 49c86e38d3f71347af6c627653ddb5b55b0344ff | |
parent | 0b6fe27c5ffe8aee75666a3f8f3b7bd479d09f8b (diff) | |
parent | 1f504a4d1c4e5c37bdab8193a42f4f5929c88f73 (diff) | |
download | bt-2f1a14d58ee0911d51ac58a556387228ecce25d0.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 oc-dev am: b2adda8177 am: 00fd683aec -s ours am: 14ae20b072 -s ours am: 1f504a4d1c -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 0b4c1014f7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12309020
Change-Id: I84b756a054c2e0ef864b575b6cc9ef3226e63985
0 files changed, 0 insertions, 0 deletions