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

Change-Id: Icfdbfc44bcb38d5fcab20e8d7c5f697f5cca27e1


Trivial merge