commit | 1efca130c98eea61e165b0db52c29caa04f416a5 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Tue Sep 12 06:34:11 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 12 06:34:11 2017 +0000 |
tree | ce78950260892dc9723b0eb2640791520b208007 | |
parent | b49e11f712e3f97f1c5ad5129144e454ae5931b8 [diff] | |
parent | c9fad76673e721ac5d814fb3ea520941ce549d66 [diff] |
Merge "Check for IControllOffload.getServer() returning null" am: c5932ab2a8 am: a3658b0fc2 am: c9fad76673 -s ours Change-Id: I4ea32048fa59dcaee62a30f57e9f318b7013f0c1