OSDN Git Service

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

Change-Id: Id9ba3368eda4c6d1d015f8f6073232aa6cb925ac