Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 18:51:16 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:51:16 +0000 (18:51 +0000)
am: 3c63160390

Change-Id: Iea04b4304a30a16f60bb854f6c544d835a0640a4


Trivial merge