OSDN Git Service

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

Change-Id: I0aa741d69e2f579a914973aff6a093a19d9097b4


Trivial merge