Skip to content
Commit 5b8bc166 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

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

am: 3245530b  -s ours

Change-Id: Ia102e1ea73a0b98117d29c017980e7bff4d240f6
parents dbbee6ef 3245530b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment