tree 03e7919ea1ed78f3082432446085a252e8bde7d7
parent 5fd9dd2e744668c2baeaeb84a30dbeeb5f0d74b6
parent 9cec380720944ebb56ea2c86d08c3b604cb84f07
author Erik Kline <ek@google.com> 1498029654 +0000
committer android-build-merger <android-build-merger@google.com> 1498029654 +0000

Merge "Always allow Ethernet to be an upstream" am: ecbe6fa147
am: 9cec380720

Change-Id: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc