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

Change-Id: Idcc451614d0eda5e48c3ef83de2d5f40f4dba72a


Trivial merge