tree 752336f46e794bea2c522f9d3f0e20e11f76363f
parent 65d96f774d9a01fd54fd2b3fbfaf21036ba321e6
parent 46260c37420f82a6e664b740365b2537767e5a76
author Kevin Rocard <krocard@google.com> 1495143703 +0000
committer android-build-merger <android-build-merger@google.com> 1495143703 +0000

Merge "audiopolicy: Two session can not offload concurrently" into oc-dev
am: 46260c3742

Change-Id: I26ab34add9e632eddec417fc7b042387dc4d1c0a