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

Change-Id: I3365b06d1471b46a547cdd174a8fc0c05bff1ddd


Trivial merge