OSDN Git Service

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

Change-Id: Ie3c2e7154357a51b4947c807347650456297d81d


Trivial merge