diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-05 19:21:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-05 19:21:51 +0000 |
| commit | e1660e8e98659d439d18a884fc39dc49b36be853 (patch) | |
| tree | e7d343efd8c7aed641b3dbafa83f724295d4d1fd | |
| parent | 26511f3923c4ced0aea0f28a5b2a6cb63a2013d0 (diff) | |
| parent | 40f09f54ec887c118c16085378ac55a971e9b54e (diff) | |
| download | bt-e1660e8e98659d439d18a884fc39dc49b36be853.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: 40f09f54ec -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: Ic0ff9254155d0fc13c57274fa836346fbe97fc50
0 files changed, 0 insertions, 0 deletions