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:46:18 +0000 (22:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 22:46:18 +0000 (22:46 +0000)
am: 37e801176e  -s ours

Change-Id: Iba51d0f957ad1277547089df074b148056d91970


Trivial merge