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

am c2081f40: resolved conflicts for merge of f04a0299 to klp-dev 

* commit 'c2081f40':
  add tests for stream type check in audio policy binder.
parents fbf3e597 c2081f40
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