tree 31e1b1b14234172371fb5de137f5cda94dab75cb
parent 331a589684a5f9b9d2a9608db47a83741bb6c2d2
parent 1bceeaac8547a5bc3395f3a19351bf4cd84cc2a0
author Leif Hendrik Wilden <leifhendrik@google.com> 1538503574 -0700
committer android-build-merger <android-build-merger@google.com> 1538503574 -0700

Merge "Allow wifi and ethenet connected at same time." am: 54d34fe8a7
am: 1bceeaac85

Change-Id: I2b180336f74697ff5467c210eabccb4813ce317f