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:44 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 22:13:44 +0000 (22:13 +0000)
am: c675cf85a7

Change-Id: Id86e6703dfc57705b361adf66da9f852498b32ea


Trivial merge