tree 838b8e027334cc9360b2cead8fd2a55eba7f8d40
parent 33fee827776563879a62b79d17ea6b4cd34780ed
parent c675cf85a7734f93cd0d853526e3f15ff28e3b6c
author Eugene Susla <eugenesusla@google.com> 1497910424 +0000
committer android-build-merger <android-build-merger@google.com> 1497910424 +0000

Merge "[Companion] Fix NPE in associate" into oc-dev am: ba003a97f8
am: c675cf85a7

Change-Id: Id86e6703dfc57705b361adf66da9f852498b32ea