tree 61c68fba70cd5fa67853a56d3e70619f1406c6e1
parent 581fa36a13b602cc5cd1c19484d6c1f8a465a4a3
parent f7021b5e06e6606ed513cea1381a1335cb842af7
author Chris Wren <cwren@android.com> 1467040723 +0000
committer android-build-merger <android-build-merger@google.com> 1467040723 +0000

Merge \\"use an observer for the default sound\\" into nyc-mr1-dev am: 4e4d325b56
am: f7021b5e06

Change-Id: I9c347978011b65075b33146d268f3dc579170733