| commit | e168bdd22042830eb436aac571fb2ea23c84b035 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Jun 10 23:25:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 23:25:03 2015 +0000 |
| tree | 8d7414bff1dbbd74049e4afa6b2e64454ed3d749 | |
| parent | 9784b406e4da2fd34d975033722f87e496ba3ea4 [diff] | |
| parent | f19acf4848393acb40ef314e1a7add45e0120011 [diff] |
am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev * commit 'f19acf4848393acb40ef314e1a7add45e0120011': Fix integer overflow when handling MPEG4 tx3g atom