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

Change-Id: I7e9dd7d66b3cebc86d6cfa9159d88c403b577945


Trivial merge