| commit | e8e71d5f079503bd40f4b920b3b45b3853560f40 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 20:10:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:10:32 2015 +0000 |
| tree | 1b7733a7b77c5ff45c03f18e3b0eaaf0d009a769 | |
| parent | c07dcbe1a644b45c36c73ae4818b8e3275064ebd [diff] | |
| parent | 8a5b2b2b8b29f194fb45c5a96f824222ea7575e7 [diff] |
am 8a5b2b2b: am ddb63b46: am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD * commit '8a5b2b2b8b29f194fb45c5a96f824222ea7575e7': libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.