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

Change-Id: Ia4ad500e676c48b5e42ca034325690ebdb071771