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:
d58a379
e58e7bf
)
Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev am...
author
Jack He
<siyuanh@google.com>
Fri, 23 Mar 2018 09:02:36 +0000
(09:02 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 23 Mar 2018 09:02:36 +0000
(09:02 +0000)
am:
e58e7bf155
Change-Id: Iaf338b1dcc1036deb9fb5a67a12f4ae1b63e032b
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