Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 18:51:57 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:51:57 +0000 (18:51 +0000)
commit094db0ff95c064aba5347882feeff0d157448717
treeaa52a62fea1f11e7a5e5d05e1968a6f9656444e2
parentc62580aebac2b5940bc7caffe8ad9f0fd80d3f72
parentdc66ee85f177dc85bc669dd51302ea290e253b86
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: fa02db7127 am: c099989faf am: 6570dc4744 am: 2cb5f272cf am: 1dabb154d5 am: a7d55ba5a8 am: ab0806ca20 am: 4b9b3cda97 am: 3cddb833e9 am: 0eb4e456b9
am: dc66ee85f1

Change-Id: I78db38565336bc29680261c5ed908d1ef5021467