[automerger skipped] Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c am: b42dfed0f4 -s ours am: 6683393d9c am: 6b081c4f0a am: 06e7586106 -s ours
am skip reason: Change-Id I9f87679d195da99a55b6faf7131da1f1af65fe01 with SHA-1 a5969b5a1d is in history
Change-Id: I5aca505ca562fd23a73487588fac34e5d0f84fd9
This commit is contained in: