From: Erik Kline <ek@google.com>
Date: Tue, 12 Sep 2017 06:19:16 +0000 (+0000)
Subject: Merge "Check for IControllOffload.getServer() returning null"
X-Git-Tag: android-x86-9.0-r1~348^2~1^2~3^2~163
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a3658b0fc2;p=android-x86%2Fframeworks-base.git

Merge "Check for IControllOffload.getServer() returning null"
am: c5932ab2a8

Change-Id: If27fca9aa594af2f58a470709d78f19f31bb316d
---

a3658b0fc262e32df81149b2511d7aabff03b3ca