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

Change-Id: I5f4cc388160be890660fd92a6cc74a4ca57624da


Trivial merge