Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 01:28:03 +0000 (01:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 01:28:03 +0000 (01:28 +0000)
commitde7d1acf8f663701d823c414d5d707bd3128f68d
tree52edffc393fe7e05e27febf9ca815269c7fffcb2
parent6305f11672f4420ff52407ef512034b0512be3a8
parent97f422dfa4f7d3008952288b515ed3abf6739f50
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

Change-Id: Ia519e7d75c85732c64458db18bad39fa307cbc55