OSDN Git Service

Merge "Merge "[Companion] Fix NPE in associate" into oc-dev am: ba003a97f8 am: 5cb26b...
authorEugene Susla <eugenesusla@google.com>
Mon, 19 Jun 2017 22:29:51 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 22:29:51 +0000 (22:29 +0000)
am: 0698755ca0

Change-Id: Idebce0cb669bd8971f84c563a4326648e093db3c


Trivial merge