Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 01:50:28 +0000 (01:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 01:50:28 +0000 (01:50 +0000)
commit3cc5c518301b5a36348d48ccd8f71930b5d78f64
tree02fe24dc713675ec098e691873882fcdbd690e12
parent4596ed3ac8eeafebcef6f5a94ae1872034e9ab21
parent4b9b3cda9795179c50f4cb7a1f312fc9a3e20e29
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

Change-Id: Ibb9e6bb6e956654dcfcee4605250a6c076a88947