Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 00:56:54 +0000 (00:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 00:56:54 +0000 (00:56 +0000)
commit889e4ea6972866aa9afc970990cc70a01bb91a07
tree89c4d946194746171108356526dfa409b1e05f1e
parent6cab656d32653892baffc74a4825ac712d9010a1
parent7ab3863a95f178bef2bc7562cf7457972a275a92
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: 87d5ca1e30
am: 7ab3863a95

Change-Id: I93f80acf734877a689163a4c65500071d216c5a9