[automerger skipped] Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c am: b42dfed0f4 -s ours

am skip reason: skipped by user joshuaduong

Change-Id: I1b02f79c7ea6323544017b404ce1ed1fe02b95c2
This commit is contained in:
Automerger Merge Worker
2020-02-22 16:03:00 +00:00

Diff Content Not Available