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

Change-Id: Ia519e7d75c85732c64458db18bad39fa307cbc55


Trivial merge