diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2021-09-13 20:56:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-13 20:56:29 +0000 |
| commit | 7ccea47a606716f4d7db8741b1ef37e9b96ce695 (patch) | |
| tree | bee1104799b559076f31142c25905a201d23ed12 /framework/java/android/bluetooth/BluetoothManager.java | |
| parent | 52f08809d194d18d52960af3fcb967f20fb60e69 (diff) | |
| parent | 540b4f23b8cb10608987eb23dd3062b7c0478849 (diff) | |
[automerger skipped] Merge "csip: Add Coordinated Set Identification Profile" am: 540b4f23b8 -s ours
am skip reason: Merged-In I67536ddcc32ace82d63e19426dce19f2bc69cdea with SHA-1 a43e3aeb15 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749722
Change-Id: I3cb1ce0008db08299e115c5244257f74a724e5a2
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions