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

Change-Id: I93f80acf734877a689163a4c65500071d216c5a9


Trivial merge