summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothManager.java
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-12-03 16:09:13 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-03 16:09:13 -0800
commit55b3ae0284f645ba71f3293e961eeec1b11ab6bb (patch)
tree2396ed0687952262bc288ee18cc5a5c28b5db433 /framework/java/android/bluetooth/BluetoothManager.java
parent83fff6d6fcebf66f373fc3713783973b1fdc7ba9 (diff)
parentc8a6ad6d8dbccc05e60a029aaed3275aadbdcc4f (diff)
Merge "Merge Android10 QPR1 into AOSP master"
am: c8a6ad6d8d Change-Id: I3b2912dffdd5be501077c9983bb922ee7a3767d1
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions