commit | 9304fc77dcb0376e2111f5b4865734eb08c1d982 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Wed Sep 21 21:18:37 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 21:18:37 2016 +0000 |
tree | f21dd5a3aa078bf002fc008244b5ecfae683580a | |
parent | 69c91191678682a3e4abd476cd389211c2048625 [diff] | |
parent | 1dd2c8b1efa8c90e352e22ea8b105178664abf53 [diff] |
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 am: 890b0db159 am: 1dd2c8b1ef Change-Id: I16458d45c56146c0a71671d6c34cdc28a26847f8