| commit | 502c695e582e3ba32a5af6ab045c5bde5b2c3fda | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Oct 20 17:45:24 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 20 17:45:24 2017 +0000 |
| tree | fffa8c7461659ba0ecb7329ee00f344c712f9e89 | |
| parent | 59a5890aac2d46c3052abadb6d49348197b7e282 [diff] | |
| parent | cdd157fbe5fdf5046892f913fd3273d570d1855e [diff] |
Merge "Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am: 1a721bb633 -s ours am: 5a1dae0cea -s ours am: fa5253c8bc -s ours am: 021923a373 -s ours am: c798254fba -s ours am: 37e801176e -s ours am: 63b868e27b -s ours am: 68d7af9137 -s ours am: 4efb8774ab -s ours am: 94a417ca10 -s ours am: 8fc33c4f75 -s ours am: ec248b8ddd -s ours am: 8334241619 -s ours am: ca252eecd7 -s ours" into oc-mr1-dev-plus-aosp