tree 2c7974fd1ea3290016cc98ce7d3950a503f2950e
parent 0555ec388640e5e5d43f94c6af44221da567f1d2
parent 8823f6d959a0c236482d59a0d3fb50794ab935f1
author Eric Laurent <elaurent@google.com> 1441405168 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441405168 +0000

am 8823f6d9: am 879eff3c: am 81bb1715: am b4aa5b3b: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff

* commit '8823f6d959a0c236482d59a0d3fb50794ab935f1':