| commit | e6382cb0e9e3fcf730faac3be661c9facd939d49 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Sat Jun 06 01:15:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 06 01:15:20 2015 +0000 |
| tree | f34f87a401e04ebfa5949a0fd7a0504504cd3159 | |
| parent | 0773dc374056f46ff2d98f6421e12365968ba423 [diff] | |
| parent | 115e995c6b3fe7ed33e2d5d88872cb87ab4e63f0 [diff] |
am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev * commit '115e995c6b3fe7ed33e2d5d88872cb87ab4e63f0': Fix integer overflow when handling MPEG4 tx3g atom