Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 00:43:40 +0000 (00:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 00:43:40 +0000 (00:43 +0000)
commit87d5ca1e3089865642d3f5973edf3cd1b1c6cf6e
tree09f8e85f354a9d5e06d8005462b1b99066280fc5
parent7e2d9f83ff4b2449938e2bef0e8de439bd553c56
parent6cea9dbc6261919e9da8ea5a6ec1f28043d38b0c
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev
am: 6cea9dbc62

Change-Id: I3525d88dbc3e04b702cef54d1759f406222047b2