Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Wed, 23 Nov 2016 22:58:04 +0000 (22:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 22:58:04 +0000 (22:58 +0000)
commit87d753030db02e966ba5d6654e9fa215c1bee5e5
tree0ecac2461514c19e89e6e9155941538fdbbed605
parent2d0071593e3e0e42ad77d2e7b4a2dcdc462c309b
parent4eb2933ecd12c79a70e20d1c896947898d04c31e
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

Change-Id: I4f95fe4c8d6d00a0fc2187f9081fde7e6d6028f8