tree cd95ced967fb21da68211d72de42d3a9cf325bf7
parent 5bd1b586e021205bd1355181e0a09a0a511b2505
parent fdc5e78062d8432685e01575e351175c214cb79d
author Eric Laurent <elaurent@google.com> 1432836171 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432836171 +0000

am fdc5e780: am 69439174: am a9424174: am b3a6d772: am bcf4164b: am 6657d551: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff automerge: b4aa5b3 automerge: 6f1b9e2

* commit 'fdc5e78062d8432685e01575e351175c214cb79d':