diff options
author | Rahul Sabnis <rahulsabnis@google.com> | 2020-08-05 22:04:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-05 22:04:08 +0000 |
commit | bd13a8fe3db817b710d6f6eca44d33ac7e842357 (patch) | |
tree | e7d343efd8c7aed641b3dbafa83f724295d4d1fd | |
parent | e1660e8e98659d439d18a884fc39dc49b36be853 (diff) | |
parent | 0b6fe27c5ffe8aee75666a3f8f3b7bd479d09f8b (diff) | |
download | bt-bd13a8fe3db817b710d6f6eca44d33ac7e842357.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-mr1-dev am: 4256337c9e -s ours am: d24757a4f0 -s ours am: 0b6fe27c5f -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 ad8fba09ac is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12307949
Change-Id: I15e4458e0589a2ce4b10d1d175f30bed8387c200
0 files changed, 0 insertions, 0 deletions