| commit | b013b15154603b132caa4b57dd3b4a00df3ad69b | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Oct 10 22:55:26 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 10 22:55:26 2017 +0000 |
| tree | c03ab4ab335a87783e3637c57a442257dea4c2fa | |
| parent | 8ac83c374b920b071b870bd4870512b22a78deb8 [diff] | |
| parent | e01fd56d7c2f7c0341aa5348ff3e09d2129b73ee [diff] |
Merge "Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours am: 1fd129f457 -s ours am: a5d924154e -s ours am: 0df59eb1e6 -s ours" into oc-mr1-dev-plus-aosp