Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Wed, 23 Nov 2016 22:50:34 +0000 (22:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 22:50:34 +0000 (22:50 +0000)
am: 2b6f277417

Change-Id: Ia4ad500e676c48b5e42ca034325690ebdb071771


Trivial merge