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:16 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:51:16 +0000 (18:51 +0000)
commit95ba108b4139c8be9a899a5aac9295aacc9b5e24
treeaa52a62fea1f11e7a5e5d05e1968a6f9656444e2
parent767da7c3192f59d04c0e22b93748286006e4ea88
parent3c63160390bce7e61c65a6618d140e6083611ec6
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: 87d5ca1e30 am: 7ab3863a95 am: 889e4ea697 am: e82b53127b am: 2b6f277417 am: 4eb2933ecd am: 87d753030d
am: 3c63160390

Change-Id: Iea04b4304a30a16f60bb854f6c544d835a0640a4