OSDN Git Service

Merge "Merge "[Companion] Fix NPE in associate" into oc-dev am: ba003a97f8 am: 5cb26b...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 19 Jun 2017 22:16:35 +0000 (22:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 19 Jun 2017 22:16:42 +0000 (22:16 +0000)

Trivial merge