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

Change-Id: Idd8768fc82b9bfe6902873829e17d1284d325793


Trivial merge