tree 1031d1e7af4882a295d4bdf02386f008ffaa98f7
parent 66c9974bb84e7cac17dfe63543e7dd3fd2b7007a
parent 135240ae675e268aeae888358cd7e7725cedae15
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580203028 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580203028 +0000

[automerger skipped] Merge "Support putting one Ethernet interface in server mode." am: e7e38501e8 am: 88bc15c4bc am: 135240ae67 -s ours
am skip reason: Change-Id Id96d581acb3fa4e52ca62dd94ec257f56bd3a1ce with SHA-1 1d48d5e90d is in history

Change-Id: I3314b899730f367f154bd8b513094076084a6cef