OSDN Git Service

Merge "[Companion] Fix NPE in associate" into oc-dev
authorEugene Susla <eugenesusla@google.com>
Mon, 19 Jun 2017 22:02:17 +0000 (22:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 22:02:17 +0000 (22:02 +0000)
am: ba003a97f8

Change-Id: Id9ba3368eda4c6d1d015f8f6073232aa6cb925ac


Trivial merge