Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 01:57:39 +0000 (01:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 01:57:39 +0000 (01:57 +0000)
commit1afe927bb08e7adc469d49686babc79dc900dbaf
tree52edffc393fe7e05e27febf9ca815269c7fffcb2
parent0ff897b3a89b65b0182612a81dcba0a9ff9acf5e
parent3cc5c518301b5a36348d48ccd8f71930b5d78f64
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 am: a7d55ba5a8 am: ab0806ca20 am: 4b9b3cda97
am: 3cc5c51830

Change-Id: Icfdbfc44bcb38d5fcab20e8d7c5f697f5cca27e1