Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 4 Apr 2017 19:00:24 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 19:00:24 +0000 (19:00 +0000)
am: 0eb4e456b9

Change-Id: Ibdeb84179be504fd098715db35b420028407600c


Trivial merge