OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f8c335 c7d4074)
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)
am: c7d4074aef

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

Change-Id: Iac013f281d63fe627f4d216f187619adad2d2ccc


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help