commit | 4a60f0509a739ab5a58fdd8ac0ffec0fe4e3cb98 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Oct 10 21:36:33 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 10 21:36:33 2017 +0000 |
tree | c03ab4ab335a87783e3637c57a442257dea4c2fa | |
parent | d825e13115b827593d148de805837c43f146fb33 [diff] | |
parent | c61caa3553cd9148944cb6dbd55f610b91ed9e36 [diff] |
Merge "Soundtrigger service: fix cross deadlock with audio policy service am: 0957621867 am: 87da65273f -s ours am: df5f9746f2 -s ours" into oc-mr1-dev-plus-aosp