From: Eugene Susla <eugenesusla@google.com>
Date: Wed, 12 Jul 2017 18:20:09 +0000 (+0000)
Subject: Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~1030^2~156
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=58582f7abfd7f2d3c3eab6a7c1db084736d731d4;p=android-x86%2Fframeworks-base.git

Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
am: 9e419d3082

Change-Id: I0aa741d69e2f579a914973aff6a093a19d9097b4
---

58582f7abfd7f2d3c3eab6a7c1db084736d731d4