tree 97acd9258e550f8885547c6b36e91a763c1f6261
parent d2cc32bcdef5feefb42b3897cfd7efbed1728eff
parent 592e85b4fdbf423d7afa32eb69c7fbae2dd960b4
author Erik Kline <ek@google.com> 1498051788 +0000
committer android-build-merger <android-build-merger@google.com> 1498051788 +0000

Merge "Always allow Ethernet to be an upstream" into oc-dr1-dev
am: 592e85b4fd  -s ours

Change-Id: I3bdfdb50557093b906a92ccebec2212274f9f255