Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 18:45:43 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:45:43 +0000 (18:45 +0000)
commit1a4cf2d6fe80b91d0de50707f4e940275147b139
treeaa52a62fea1f11e7a5e5d05e1968a6f9656444e2
parented73f2e50497ef794273cdddf5b927dd67373d48
parent98ebd8d961e7777399590a7a58bd390886dc0248
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: 3cc5c51830 am: 1afe927bb0
am: 98ebd8d961

Change-Id: Ic135ed17dd8003c82b431276382a080ac8355a03