| commit | 2200444dd805829913e5ac37242467654158037e | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Thu Aug 27 20:35:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:35:42 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 44275e01a3a54857af7ad08decee0a1140bad562 [diff] | |
| parent | f2a1cc806a492784d7f817d80f7f9573b12bda69 [diff] |
am f2a1cc80: am c7c651af: (-s ours) am ece214ec: 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 'f2a1cc806a492784d7f817d80f7f9573b12bda69':