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

Change-Id: Idb54c3ac8f0df69cba79c1da2ffb21b1f8c4087c


Trivial merge