| commit | f475f6c0cf28f3b4c1ae677febb7590c70865f81 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Jun 11 13:33:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 11 13:33:37 2015 +0000 |
| tree | 8d7414bff1dbbd74049e4afa6b2e64454ed3d749 | |
| parent | 068805802f78ff82e4ba40adffc33ddcd3b0eb8f [diff] | |
| parent | e168bdd22042830eb436aac571fb2ea23c84b035 [diff] |
am e168bdd2: am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev * commit 'e168bdd22042830eb436aac571fb2ea23c84b035': Fix integer overflow when handling MPEG4 tx3g atom