Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 18:45:17 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:45:17 +0000 (18:45 +0000)
commite75af2c7c4cf5147e972d7681866f938309eca26
treeaa52a62fea1f11e7a5e5d05e1968a6f9656444e2
parent8e43c5e8af03016d7455bb76ac37666cd401094c
parent228dfe6ecdd11189c3bc52ac15524540c0ceaef7
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: 87d5ca1e30 am: 7ab3863a95 am: 889e4ea697 am: e82b53127b am: 2b6f277417 am: 97f422dfa4 am: de7d1acf8f
am: 228dfe6ecd

Change-Id: I3db25b442467b43fad0962268e0d74ac2a9b4f58