Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 00:51:28 +0000 (00:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 00:51:28 +0000 (00:51 +0000)
commit42149e7b887e8cefabc17d3b07ea42bf0706d6e8
tree129fcddfc5279bd83b6d92b65c09b43008fc7de3
parenta2c0c6be9d0cad1740e7fb69b07edabed00c2e42
parent87d5ca1e3089865642d3f5973edf3cd1b1c6cf6e
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62
am: 87d5ca1e30

Change-Id: Idcc451614d0eda5e48c3ef83de2d5f40f4dba72a