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:
e353ce4
29ccd8c
)
Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605
author
Marco Nelissen
<marcone@google.com>
Wed, 21 Sep 2016 20:51:33 +0000
(20:51 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Sep 2016 20:51:33 +0000
(20:51 +0000)
am:
29ccd8c55d
-s ours
Change-Id: If514b12f86a85a90ff0835eeafa5a31324ec3c17
Trivial merge