OSDN Git Service

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp...
authorEric Laurent <elaurent@google.com>
Thu, 19 Oct 2017 22:07:17 +0000 (22:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 22:07:17 +0000 (22:07 +0000)
am: fa5253c8bc  -s ours

Change-Id: I81fd60488c379d4aed791d2a1c6f2f99c8f51585


Trivial merge