OSDN Git Service

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

Change-Id: I690b6d88bcce507d7fbae855cd9939616ac86212