OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
cf3b663
1fd129f
)
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc...
author
Eric Laurent
<elaurent@google.com>
Tue, 10 Oct 2017 22:29:54 +0000
(22:29 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 10 Oct 2017 22:29:54 +0000
(22:29 +0000)
am:
1fd129f457
-s ours
Change-Id: I5471dae8cdbd105f8f76e8c7fd3bcb1f9cc847a8
Trivial merge