OSDN Git Service

Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810 am: e7d5b13f53 am: deb32c220b
authorMarie Janssen <jamuraa@google.com>
Fri, 10 Feb 2017 18:23:00 +0000 (18:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Feb 2017 18:23:00 +0000 (18:23 +0000)
commit9241c3ec3c726d005c3f5c2058d9713836978507
tree132e379e8582ab1ccd0ba51bb84b4dcd03cda44d
parent765062ac3dd59caf85a1d4d3603c55621a0d6420
parent76405153d1a83623909ba50e1295e2e6db5c0c91
Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810 am: e7d5b13f53 am: deb32c220b
am: 76405153d1

Change-Id: I5d4283ec0aa65b8faf6a97693dcdb40df353c48a
AndroidManifest.xml
src/com/android/settings/bluetooth/Utils.java