tree 341dea81650cb0e01709a0c25bccadf3b945a54f
parent 9239df04b3b9b60efae4999e0088f1c23f03e44f
parent ace309a7adcc655b2596927866d4c485277602f2
author Lorenzo Colitti <lorenzo@google.com> 1506501558 +0000
committer android-build-merger <android-build-merger@google.com> 1506501558 +0000

Merge "Ensure that Ethernet is supported if the service is running." am: 266fad4970
am: ace309a7ad

Change-Id: I6a1e8364c3e0801cf75e13920606ec04a1054e12