OSDN Git Service

am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using...
authorChong Zhang <chz@google.com>
Tue, 18 Aug 2015 18:20:29 +0000 (18:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2015 18:20:29 +0000 (18:20 +0000)
* commit '5d7a381b9c86ff4f00a95063d57ad0a80467799c':
  stagefright: check IMemory::pointer() before using the allocation

1  2 
media/libstagefright/ACodec.cpp

Simple merge