OSDN Git Service

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp...
authorEric Laurent <elaurent@google.com>
Thu, 19 Oct 2017 23:59:56 +0000 (23:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 23:59:56 +0000 (23:59 +0000)
commitfaee2cdf2da87250710d8f31ed41da4e84e6ffc7
treea31e3ef8a7b74a5d0ad7363eb5012d546000a389
parent6c930ece3cb026229ab7ee0631c29125df1ce89f
parent849a10fce0ed5b5cf26f9b7ef90163b357479e24
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am: b6b4443dbb am: 74684f638b am: af5ce97781 am: 7190597c26 am: 5de64b02a3  -s ours am: 2ed01f0006  -s ours am: 1ade78dc5d  -s ours am: c75c947a42  -s ours
am: 849a10fce0  -s ours

Change-Id: Ic1dc85dd5a6c2b6cd3cb53cacc6371d2f43a171f