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:
eff483b
19afb38
)
am 19afb386: Merge "Remove streaming URI from default logs"
author
Marco Nelissen
<marcone@google.com>
Thu, 13 Mar 2014 15:54:25 +0000
(15:54 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 13 Mar 2014 15:54:25 +0000
(15:54 +0000)
* commit '
19afb3869eb6a3e3733dc1f7420e1d4c3c03d376
':
Remove streaming URI from default logs
1
2
media/libstagefright/httplive/LiveSession.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/libstagefright/httplive/M3UParser.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/httplive/LiveSession.cpp
Simple merge
diff --cc
media/libstagefright/httplive/M3UParser.cpp
Simple merge
OSDN Git Service
