OSDN Git Service

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

Change-Id: I4ea32048fa59dcaee62a30f57e9f318b7013f0c1


Trivial merge