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:
b7349b2
ca3f49d
)
Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5
author
Chih-Hung Hsieh
<chh@google.com>
Tue, 24 May 2016 18:56:37 +0000
(18:56 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 24 May 2016 18:56:37 +0000
(18:56 +0000)
am:
ca3f49d594
* commit '
ca3f49d594f5c00e6b5d6817bcdb0af02e7224e6
':
Fix misc-macro-parentheses warnings in audio media jni.
Change-Id: I3828c9720f7fe91bc60058daeca2d598f0302d32
1
2
core/jni/android_media_AudioRecord.cpp
patch
|
diff1
|
diff2
|
blob
|
history
core/jni/android_media_AudioTrack.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/jni/android_media_MediaDrm.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/jni/audioeffect/android_media_AudioEffect.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/jni/audioeffect/android_media_Visualizer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/jni/android_media_AudioRecord.cpp
Simple merge
diff --cc
core/jni/android_media_AudioTrack.cpp
Simple merge
diff --cc
media/jni/android_media_MediaDrm.cpp
Simple merge
diff --cc
media/jni/audioeffect/android_media_AudioEffect.cpp
Simple merge
diff --cc
media/jni/audioeffect/android_media_Visualizer.cpp
Simple merge