tree 0ed3e1cd396814ac53d27812f102f0f50b68570b
parent 1481cd53bfffbe4301deb4151ad69722be8ea4c6
parent 4e4d325b56996f4aa72f48d669ddfe8ad628f7b4
author Chris Wren <cwren@android.com> 1467040454 +0000
committer android-build-merger <android-build-merger@google.com> 1467040454 +0000

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

Change-Id: Iae7822d0e0282ac9be691a4f26dbc7f8751e02f9