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:
6f444c9
0b07b80
)
Merge "Remove dead setRingerMode(mode, mask)"
author
Glenn Kasten
<gkasten@google.com>
Fri, 20 Jan 2012 18:07:06 +0000
(10:07 -0800)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 20 Jan 2012 18:07:06 +0000
(10:07 -0800)
1
2
include/media/AudioSystem.h
patch
|
diff1
|
diff2
|
blob
|
history
media/libmedia/AudioSystem.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/audioflinger/AudioPolicyService.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/audioflinger/AudioPolicyService.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/media/AudioSystem.h
Simple merge
diff --cc
media/libmedia/AudioSystem.cpp
Simple merge
diff --cc
services/audioflinger/AudioPolicyService.cpp
Simple merge
diff --cc
services/audioflinger/AudioPolicyService.h
Simple merge