tree d3e3c3eeef0da1b4c99e3c17a22d2a3217cddbc1
parent 8a16f92270f4cc803292adfb533838603c67d742
parent 67a041fa1f4b2e7143630a68db84af1e523375c5
author Andreas Huber <andih@google.com> 1314904823 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314904824 -0700

Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset."