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:
74cda34
2c181be
)
am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge...
author
Nick Kralevich
<nnk@google.com>
Tue, 11 Aug 2015 05:25:13 +0000
(
05:25
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 11 Aug 2015 05:25:13 +0000
(
05:25
+0000)
* commit '
2c181bec9c781e7e50d99fb4e3b981b3d0a756f3
':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Trivial merge