OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e10d2c5
8a12361
)
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
author
Jean-Michel Trivi
<jmtrivi@google.com>
Tue, 12 Jun 2018 05:18:53 +0000
(22:18 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 12 Jun 2018 05:18:53 +0000
(22:18 -0700)
am:
8a12361b8c
Change-Id: Ia47fe3acf3d637d42d0ce3efaa6be1e0718e2acd
1
2
services/core/java/com/android/server/audio/AudioService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/audio/AudioService.java
Simple merge