OSDN Git Service

Merge "Check for IControllOffload.getServer() returning null" am: c5932ab2a8
authorErik Kline <ek@google.com>
Tue, 12 Sep 2017 06:26:11 +0000 (06:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 06:26:11 +0000 (06:26 +0000)
am: a3658b0fc2

Change-Id: I69d8504f8487218f14faf4f35b5307c396f9cb4f


Trivial merge