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:
657c313
d181b01
)
Merge "Do not setForceUse when a2dp config without change" am: 8a984b9f08 am: a49ca727be
author
zengjing
<zengjing@xiaomi.com>
Mon, 28 May 2018 19:06:41 +0000
(12:06 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 28 May 2018 19:06:41 +0000
(12:06 -0700)
am:
d181b01ce3
Change-Id: If5b52f0f80bfd2ea299c3e11068660a14132ce82
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