Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Wed, 23 Nov 2016 22:51:02 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 22:51:02 +0000 (22:51 +0000)
commit3cddb833e92c317098329508fdde32bf66474c8c
tree0ecac2461514c19e89e6e9155941538fdbbed605
parent9f9439f10a3ad79edf3c9d9349274632f350e353
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: Idd8768fc82b9bfe6902873829e17d1284d325793