OSDN Git Service

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am...
authorMarco Nelissen <marcone@google.com>
Wed, 21 Sep 2016 21:11:53 +0000 (21:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 21:11:53 +0000 (21:11 +0000)
commit890b0db1591774de32aead55d8670afe79674494
tree50c55a9ee6d351f454c8031f19eaf05ed5418072
parent130dbfb63c1b9b732028f19047eec768e1912d9d
parent04180a9fa8359d4398c26a844efd298f5e821682
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d am: f5b8755f18 am: 7d5774b0ea am: 9668a1012a am: b87e75a6bf am: 61b8e13fdd am: f160b4781a
am: 04180a9fa8

Change-Id: I4786bdeca1f3fc36c4a5ec8b47efea8c96b670f9