Commit 5e253ebe authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

am bccc13cc: (-s ours) am debc2a5f: resolved conflicts for merge of 6c1149d7 to lmp-dev 

automerge: 3b39bba1

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