diff options
| author | Chris Manton <cmanton@google.com> | 2022-02-09 19:14:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-09 19:14:37 +0000 |
| commit | 9ce28a54e4ac6af60ceaaf6a88c4e8e257a582d1 (patch) | |
| tree | 44ca7fa452b235be24ad5dee83322cfbc3f3a2a6 /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | ed24f604b5afde36b012d9ce2d1483cf4a58ba54 (diff) | |
| parent | 8db7f7b0c6dcaf7a5fc6269288f2b8dac8e58235 (diff) | |
[automerger skipped] Merge changes I8672b5ff,I8e0e85b1 am: 96a7ffd23c am: 7b20aea282 am: dbfff87105 -s ours am: 8db7f7b0c6 -s ours
am skip reason: skipped by user cmanton
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1975994
Change-Id: I4d205d28a556147592d16c96a72acdbc30688330
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java')
0 files changed, 0 insertions, 0 deletions