Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 4 Apr 2017 19:00:00 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 19:00:00 +0000 (19:00 +0000)
commit2fa00ba9e1619efa9e00a0669fcf89676c6e9bdd
treea86fb931752b2d8c682861a4bd0241c788b02f3b
parent5da99f4f480647fe534e7812c2e613d73c72f560
parent87d753030db02e966ba5d6654e9fa215c1bee5e5
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: 4eb2933ecd
am: 87d753030d

Change-Id: Ic19d6d2303a623cc3f008f76d7c4eac413154b7c