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:
7153494
17a736c
)
Merge "Update comments"
author
Glenn Kasten
<gkasten@google.com>
Wed, 21 Mar 2012 14:24:21 +0000
(07:24 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 21 Mar 2012 14:24:21 +0000
(07:24 -0700)
1
2
media/libmedia/AudioTrack.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/audioflinger/AudioFlinger.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/audioflinger/AudioMixer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libmedia/AudioTrack.cpp
Simple merge
diff --cc
services/audioflinger/AudioFlinger.cpp
Simple merge
diff --cc
services/audioflinger/AudioMixer.cpp
Simple merge