summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothManager.java
diff options
context:
space:
mode:
authorHansong Zhang <hsz@google.com>2018-11-20 18:35:26 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-11-20 18:35:26 -0800
commit992c3878846381ff911c1e72ffed8832c8814a41 (patch)
tree5fb86c6a5798f9c921e0a69ed4e7607d462f2d83 /framework/java/android/bluetooth/BluetoothManager.java
parent6173b9530961d2daef317a1a200678122d918cf3 (diff)
parent0dd80de377d1ad9b559b406022bfe69c980fd2d6 (diff)
Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 1a80595b97 am: e366b162b3
am: 0dd80de377 Change-Id: Ib879f947b1db9579ec46efc79351a3b9247c09c8
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions