Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 4 Apr 2017 18:55:22 +0000 (18:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 18:55:22 +0000 (18:55 +0000)
commit8f895972cdba8d230635f626683d4748988c922c
treea86fb931752b2d8c682861a4bd0241c788b02f3b
parenta675ac6711bab7990741f45ef4bbe1355d675448
parentde7d1acf8f663701d823c414d5d707bd3128f68d
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

Change-Id: Ib7b2e0c4118b2f7d377eb028c49dd8b115cfa3a3