Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 01:27:55 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 01:27:55 +0000 (01:27 +0000)
commita7d55ba5a82f8fad1326252e3c262888cb7ec316
tree89c4d946194746171108356526dfa409b1e05f1e
parentf1855db31dbfc7779402963e7b4b05cc0a3077db
parent1dabb154d5b507c8ee7621295f72b5532ab11ca1
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

Change-Id: I3365b06d1471b46a547cdd174a8fc0c05bff1ddd