tree 1f93edee95a8c6f6be55b89877bcd11154d11386
parent dfc6939ed57c0bda2715e3264f816a7d640a16bc
parent ecbe6fa147a38369c2309c1b6fb7d7313d9ca320
author Erik Kline <ek@google.com> 1498029226 +0000
committer android-build-merger <android-build-merger@google.com> 1498029226 +0000

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

Change-Id: Ic9fd4bfd6ba7ecc00552019f804b87bc203ea98a