OSDN Git Service

resolve merge conflicts of ae7641a to nyc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Tue, 7 Jun 2016 21:47:47 +0000 (21:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 21:47:47 +0000 (21:47 +0000)
commitaa3142551faa2916774f3e7ef4c68cb7718e280b
treee335babc02ee1f35e56c9fd60b7dcfac6b917e8a
parent3f8c335ec893eddcb49f892e1b2d8eeb06aae940
parentc7d4074aef4aee0d7ec7e2d1413cf370f6756291
resolve merge conflicts of ae7641a to nyc-dev-plus-aosp
am: c7d4074aef

* commit 'c7d4074aef4aee0d7ec7e2d1413cf370f6756291':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: Iac013f281d63fe627f4d216f187619adad2d2ccc