| commit | c8952a159ee2d552fcd3b13622a0a92d0110100f | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 20:35:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:35:23 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 3e16013fe2e0065c8e9d924de64227ba3047d562 [diff] | |
| parent | 8d7d1dfb5dd462bbfdabf197a57246b1a0c632bb [diff] |
am 8d7d1dfb: am e42d7fb5: (-s ours) am e4afd21c: am a6f0b041: am f153ecd2: am 91c71293: am 91fc84f2: am de5c4c46: am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev * commit '8d7d1dfb5dd462bbfdabf197a57246b1a0c632bb':