tree f822ea1fa276b3dffed0cc959cc7dabebd05b446
parent c1810b9acc580e885f5fe4148e975d9062430733
parent 24aa40363f8163ffad92b4c07f80185234c6ab3c
author Lorenzo Colitti <lorenzo@google.com> 1506502199 +0000
committer android-build-merger <android-build-merger@google.com> 1506502199 +0000

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

Change-Id: I85f9670815289a3c11adf159107f05619899d0da