OSDN Git Service

Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
authorEugene Susla <eugenesusla@google.com>
Thu, 29 Jun 2017 00:03:14 +0000 (00:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 00:03:14 +0000 (00:03 +0000)
am: c55f7d2180

Change-Id: I9e92d7d7d654af0eeee3d7a5771864280e25dd5d


Trivial merge