OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b6b4443
1a721bb
)
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev
author
Eric Laurent
<elaurent@google.com>
Tue, 10 Oct 2017 22:08:23 +0000
(22:08 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 10 Oct 2017 22:08:23 +0000
(22:08 +0000)
am:
1a721bb633
-s ours
Change-Id: I1cb6bfc9221a5e095b4aa9db8745fdf183a8ddbf
Trivial merge