commit | 65cb36e5d4112722a22100d5d5e55d8afd8a0457 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Tue Sep 12 03:15:35 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 12 03:15:35 2017 +0000 |
tree | 50b3a6039bb15533b4ebe01064e54c70f6638fdc | |
parent | 375d6dff81e659c0beee07fc5d43f07ca68285a9 [diff] | |
parent | b49e11f712e3f97f1c5ad5129144e454ae5931b8 [diff] |
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev am: ec02583438 am: b49e11f712 Change-Id: Ib2d1862367145260ac83f14d181646eb827538f8