| commit | 620e622cd319eacf4081614878d5de167bae3cfe | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Fri Oct 20 18:00:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 18:00:30 2017 +0000 |
| tree | 442bcf007f10f7696e08151f345d31b98e32b989 | |
| parent | ecc0a4173c5f55b1e4b626de724675fc9704007b [diff] | |
| parent | 59a5890aac2d46c3052abadb6d49348197b7e282 [diff] |
Merge "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 am: faee2cdf2d -s ours am: 836b713352 -s ours am: 24e679966e -s ours am: 92d161a277 -s ours" into oc-mr1-dev-plus-aosp am: 59a5890aac -s ours Change-Id: Ib8da31b8373ba8aa5da85ce93100479afd3afca6