[automerger skipped] Merge "Add support for TAP interfaces in TestNetworkManager." into qt-dev am: 5c7c6a4b7d -s ours

am: 0e9f4ada31 -s ours
am skip reason: change_id I88bfd7f37c0ba0228f8288fe92212618ce134e4f with SHA1 93fac2892e is in history

Change-Id: Ia633c9de407a62075e05efa807a017013fc028ce
This commit is contained in:
Lorenzo Colitti
2019-04-11 18:27:27 -07:00
committed by android-build-merger

Diff Content Not Available