tree 6bf2e6fc070ffb9a74dc663abc897d9fbbe326e2
parent 1ae9d0bced051a03dbc2fb1999bd16a6a4396176
parent 54d34fe8a7ae744c453341f6b1e0a98a18b54d15
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: 54d34fe8a7

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc