| commit | 59a5890aac2d46c3052abadb6d49348197b7e282 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Oct 20 17:43:52 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 20 17:43:52 2017 +0000 |
| tree | fffa8c7461659ba0ecb7329ee00f344c712f9e89 | |
| parent | d82dac815d890e623ce38425f38063e0b3524f02 [diff] | |
| parent | c89f15f48044b8aed78c4decfb420d118c98dc6f [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