OSDN Git Service

Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev am: d0f2d1f9ac
authorJulia Reynolds <juliacr@google.com>
Thu, 21 Apr 2016 15:20:06 +0000 (15:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 15:20:06 +0000 (15:20 +0000)
am: e042a3fe57

* commit 'e042a3fe577b9c19540b6e08376ac068b9bc1ab0':
  Don't call into audiomanager holding a zen lock.

Change-Id: Ieb42deb5da289cf6ffaa036483d811aeb40c63e3


Trivial merge