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:
ca05a87
52546c0
)
am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
author
Jean-Baptiste Queru
<jbq@google.com>
Fri, 20 Jan 2012 01:25:58 +0000
(17:25 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 20 Jan 2012 01:25:58 +0000
(17:25 -0800)
* commit '
ba7f0d2a03643ce429421b81febf18fd50473070
':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
1
2
media/libstagefright/AwesomePlayer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/audioflinger/AudioFlinger.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/audioflinger/AudioMixer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/camera/libcameraservice/CameraService.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/AwesomePlayer.cpp
Simple merge
diff --cc
services/audioflinger/AudioFlinger.cpp
Simple merge
diff --cc
services/audioflinger/AudioMixer.cpp
Simple merge
diff --cc
services/camera/libcameraservice/CameraService.cpp
Simple merge