OSDN Git Service

Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev am: 9e419d3082
authorEugene Susla <eugenesusla@google.com>
Wed, 12 Jul 2017 18:34:01 +0000 (18:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 18:34:01 +0000 (18:34 +0000)
am: 58582f7abf

Change-Id: I7d7faa17db64be9f01735e2fe0ec216a689042d1


Trivial merge