OSDN Git Service

Merge "No need to explicitly list ethernet upstream type" am: 01017959fe
authorErik Kline <ek@google.com>
Thu, 29 Jun 2017 12:35:15 +0000 (12:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 12:35:15 +0000 (12:35 +0000)
am: 065e3a7786

Change-Id: I5442a9298822af5f6cbfa2570906bc38018c07e4


Trivial merge