tree 408b6579abffca834df44ec297388770c2188265
parent c4df82d29233c5a65d4905296cfd695714beab3a
parent 766fa6a6235ceba433f4ea588ee23fe73e9d9f91
author Tina Zhou <tinazh@google.com> 1499980629 +0000
committer android-build-merger <android-build-merger@google.com> 1499980629 +0000

Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev am: 8482d8c85c am: 766fa6a623
am: 14a394402f

Change-Id: I5586b1f18e12f0022040de044ad1291b642dbf9e