OSDN Git Service

Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea
authorMarie Janssen <jamuraa@google.com>
Mon, 30 Jan 2017 17:57:02 +0000 (17:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Jan 2017 17:57:02 +0000 (17:57 +0000)
commitca312c1cd35dd92a2ac8d008115524605d21605e
treeef109ff74e8291f193800136fd0d6d9651ef2907
parent1852c380e0cb5497f1eb0587e97d4e6048961dd8
parent7f8d8638ebf0f052e9a8c214206c51ed3e504b97
Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea
am: 7f8d8638eb

Change-Id: I6f02c4ddc0fe56cda5af2dcf2f5193ba13522792
core/java/android/bluetooth/BluetoothAdapter.java