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:
d5a8bf0
e1c3962
)
Merge "Use audio_format_t consistently"
author
Glenn Kasten
<gkasten@google.com>
Thu, 12 Jan 2012 18:30:28 +0000
(10:30 -0800)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 12 Jan 2012 18:30:28 +0000
(10:30 -0800)
1
2
include/media/AudioTrack.h
patch
|
diff1
|
diff2
|
blob
|
history
media/libmedia/AudioTrack.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/libmedia/JetPlayer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/libmedia/mediaplayer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/libmediaplayerservice/MediaPlayerService.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/media/AudioTrack.h
Simple merge
diff --cc
media/libmedia/AudioTrack.cpp
Simple merge
diff --cc
media/libmedia/JetPlayer.cpp
Simple merge
diff --cc
media/libmedia/mediaplayer.cpp
Simple merge
diff --cc
media/libmediaplayerservice/MediaPlayerService.cpp
Simple merge
OSDN Git Service
