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:57 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:51:57 +0000 (18:51 +0000)
am: dc66ee85f1

Change-Id: I78db38565336bc29680261c5ed908d1ef5021467


Trivial merge