OSDN Git Service

Merge "Limit mp4 atom size to something reasonable" into klp-dev
authorMarco Nelissen <marcone@google.com>
Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)
am: 9af51c59dc

Change-Id: Id16a06b7ec4fceac9ecec7ed3504fdf233095268


Trivial merge