Chenbo Feng b67b237853 resolve merge conflicts of 921e4b7e1c to oc-dev ...

Test: I solemnly swear I tested this conflict resolution.
      run cts --module CtsNativeTestCases

Change-Id: I4c8764a00d30ab7ff94eff07870ec79c7d7bc67d

2017-07-17 21:54:20 -07:00

..

qtaguid

resolve merge conflicts of 921e4b7e1c to oc-dev

2017-07-17 21:54:20 -07:00

Android.mk

Add test to check sock addr in qtaguid ctrl file

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