OSDN Git Service

Merge "Support associating with an already-paired device" into oc-dev
authorEugene Susla <eugenesusla@google.com>
Wed, 14 Jun 2017 00:17:19 +0000 (00:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 00:17:19 +0000 (00:17 +0000)
am: c041c7a34e

Change-Id: I0af2c5f93b8e0387f28f9c34c81b20ad5a9875e2


Trivial merge