| commit | 7d3be41436e91a1d79b3a38c651bcd0d2c221f6d | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Jun 12 16:29:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 12 16:29:20 2015 +0000 |
| tree | 45cfcde5a5ad36bf86c5d2d36b2944b90a6f2c8d | |
| parent | 7e2d436ff3338e42df5f31cf2aea4d0d19886b0c [diff] | |
| parent | f475f6c0cf28f3b4c1ae677febb7590c70865f81 [diff] |
am f475f6c0: am e168bdd2: am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev * commit 'f475f6c0cf28f3b4c1ae677febb7590c70865f81': Fix integer overflow when handling MPEG4 tx3g atom