| commit | b81c3e8f1968a34f9af3c2b97fed2a6f4382acb4 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 27 20:35:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:35:14 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 780837bd784c7d8876aaae9fc18d9b9382cfc1be [diff] | |
| parent | d5910fb6a7df476bf706e0f096b90c6aff86e6a4 [diff] |
am d5910fb6: am 9dcfe411: (-s ours) am 7c415afd: am 90be27c6: am 4c5695d8: am f248e3ae: am 8369ac13: am 33235986: am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev * commit 'd5910fb6a7df476bf706e0f096b90c6aff86e6a4':