Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 01:12:24 +0000 (01:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 01:12:24 +0000 (01:12 +0000)
commit2cb5f272cfd974597cc91209e002c633eb70555c
tree7918f9cc9eb0199c7ac39a504d0be5b59e92533b
parent41db2c5a2a9e5a1b01134af0393dbcee94007abe
parent6570dc474481c5d0cbee81aca8be04ea241e7f71
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: fa02db7127 am: c099989faf
am: 6570dc4744

Change-Id: I5677ab681b1f3e3270363d40dacc7a0907168ef1