commit | ece214ec1ad3f7fc5b141a4a35ee9e42e046bca1 | [log] [tgz] |
---|---|---|
author | Chong Zhang <chz@google.com> | Thu Aug 20 01:42:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:42:14 2015 +0000 |
tree | 1aed0b1e0d3036eb117d1db7a6c359459c2a59d5 | |
parent | 06d7e4d3666ea1625c35930102a00b6c8fb9ac63 [diff] | |
parent | d9f0be89f812883128683776498b3387abbf63b5 [diff] |
am d9f0be89: (-s ours) am d1884052: am bfadec12: am 25c00122: am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev * commit 'd9f0be89f812883128683776498b3387abbf63b5': stagefright: check IMemory::pointer() before using the allocation