tree cb29c02e2cfe66a4d24542c710ae19ba12e8970c
parent 9c544bb666bc990812422797c326a76a1bf53beb
parent 6e51336da3487318459b47191270391f3cf98b96
author Eric Laurent <elaurent@google.com> 1489629950 +0000
committer android-build-merger <android-build-merger@google.com> 1489629950 +0000

Merge "audio policy: add rule for ringtone duplication over speaker + SCO" am: dc671c4e33 am: 42d5e65d2b
am: 6e51336da3

Change-Id: I67dd17852ae81df011eeb232daab5c1f290ab18a