OSDN Git Service

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

Change-Id: Ib65cfee5e317b03ce57dc4cc695241dc62aaf282


Trivial merge