Chenbo Feng 72ea1b2420 Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev ...

am: f33518ff9d

Change-Id: I705950d7d620ac21cc74c2584c0e3256f17af15e

2017-09-14 03:55:19 +00:00

..

qtaguid

Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev

2017-09-14 03:55:19 +00:00

Android.mk

Add test to check sock addr in qtaguid ctrl file

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