Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 4 Apr 2017 19:00:24 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 19:00:24 +0000 (19:00 +0000)
commit8df9cc02b75748abd097fdf186c983b34306c878
treea86fb931752b2d8c682861a4bd0241c788b02f3b
parentd4aac721b8226970aa24b886ee2abc03aea552ab
parent0eb4e456b98905374d07bc3c79847ce2f5e13c4b
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: 3cddb833e9
am: 0eb4e456b9

Change-Id: Ibdeb84179be504fd098715db35b420028407600c