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

Change-Id: Icfd745cc2f6137e8b2d05b0b413a20c8f9ab5418


Trivial merge