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

Change-Id: I3db25b442467b43fad0962268e0d74ac2a9b4f58


Trivial merge