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)
commitc9fad76673e721ac5d814fb3ea520941ce549d66
tree9b43e3637e6c48c902c2afb3e6e61d5766d40214
parent428f7402bac2f0fec306a477b314cafe19af8d8b
parenta3658b0fc262e32df81149b2511d7aabff03b3ca
Merge "Check for IControllOffload.getServer() returning null" am: c5932ab2a8
am: a3658b0fc2

Change-Id: I69d8504f8487218f14faf4f35b5307c396f9cb4f