| commit | f51567e730ecc6e3d64e534d0056614c59e5cfb5 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Sat Aug 01 15:48:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 15:48:23 2015 +0000 |
| tree | 00de5e85a4e3d5aac9737c0921e943a056d6e301 | |
| parent | 11baa7a8dd790747bffead8fcc47a2df2097145c [diff] | |
| parent | 30aa138d91eff8bbb7eb5527f5e3ff81b3f7190f [diff] |
am 30aa138d: am 8a2dd589: Merge "Fix integer overflow when handling MPEG4 tx3g atom" * commit '30aa138d91eff8bbb7eb5527f5e3ff81b3f7190f': Fix integer overflow when handling MPEG4 tx3g atom