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

Change-Id: I48fe8cbcf8e3a3cb2a9590828254ddc4f2e1d710


Trivial merge