Commit bccc13cc authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am debc2a5f: resolved conflicts for merge of 6c1149d7 to lmp-dev 

* commit 'debc2a5f':
  add tests for stream type check in audio policy binder.
parents e3b8ad15 debc2a5f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment