Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 01:05:14 +0000 (01:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 01:05:14 +0000 (01:05 +0000)
commited2847e325e4af9c3dedf526ca560fbf214879c0
tree52edffc393fe7e05e27febf9ca815269c7fffcb2
parent1459961551cd1a0501037b2fa52cb3806c7e5378
parent42149e7b887e8cefabc17d3b07ea42bf0706d6e8
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: 87d5ca1e30
am: 42149e7b88

Change-Id: Ic58049aa16f4e45866e5b6fa70fc7398526f04c5