Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 01:05:14 +0000 (01:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 01:05:14 +0000 (01:05 +0000)
am: 42149e7b88

Change-Id: Ic58049aa16f4e45866e5b6fa70fc7398526f04c5


Trivial merge