Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 18:44:37 +0000 (18:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:44:37 +0000 (18:44 +0000)
commitcf62e752d38239da5469c47de34fd9e70f8b211b
treeaa52a62fea1f11e7a5e5d05e1968a6f9656444e2
parentad6ff7999ea82668393d986fba01071bcb057a6f
parentc354904afbb096a368d3e38ea6902c4af53a3452
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: 87d5ca1e30 am: 42149e7b88 am: ed2847e325 am: 2be672f23c am: 95d7aaf93a
am: c354904afb

Change-Id: I48fe8cbcf8e3a3cb2a9590828254ddc4f2e1d710