OSDN Git Service

Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
authorErik Kline <ek@google.com>
Tue, 12 Sep 2017 03:06:53 +0000 (03:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 03:06:53 +0000 (03:06 +0000)
commitb49e11f712e3f97f1c5ad5129144e454ae5931b8
treece78950260892dc9723b0eb2640791520b208007
parentdd5fc73944e3e32401fb53b27345ac4d8553f100
parentec02583438effc8b3559ccdfa6c78a8fe1da6fc4
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
am: ec02583438

Change-Id: I5a57a9fd14dc53eaf1722fbc9a972f4f73280497