tree 86a4fe420a0b81735919debd7f328daf57eea7d9
parent 47820e87d4876e9428a6194adf2c59844e946e52
parent 75e74f759d39173680ee9596673f03034b21d1dd
author Leif Hendrik Wilden <leifhendrik@google.com> 1538503031 -0700
committer android-build-merger <android-build-merger@google.com> 1538503031 -0700

Merge "Allow wifi and ethenet connected at same time."
am: 75e74f759d

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc