Chenbo Feng 997814263d Resolve merge conflicts of 8482d8c85c to nougat-cts-dev ...

Test: I solemnly swear I tested this conflict resolution.
      in cts-tf: run cts --module CtsNativeNetTestCases

Change-Id: I15253841993a79320dafa8669f0289c28f4ff4ea

2017-07-17 20:44:39 +00:00

..

qtaguid

Resolve merge conflicts of 8482d8c85c to nougat-cts-dev

2017-07-17 20:44:39 +00:00

Android.mk

Add test to check sock addr in qtaguid ctrl file

2017-06-28 13:47:30 -07:00