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