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

Change-Id: Ic135ed17dd8003c82b431276382a080ac8355a03


Trivial merge