tree a2aaa751fe9a7d39666587682be94896e3bd19ac
parent 9707195bf18fed1318e5c747db82f9783262a137
parent 877c76ac42701859fb8185f05c4724a06867fc07
author Chong Zhang <chz@google.com> 1439917654 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439917654 +0000

am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

* commit '877c76ac42701859fb8185f05c4724a06867fc07':
  stagefright: check IMemory::pointer() before using the allocation