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

Change-Id: I7e9dd7d66b3cebc86d6cfa9159d88c403b577945