OSDN Git Service

am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocatin...
authorAndreas Huber <andih@google.com>
Wed, 30 Nov 2011 00:33:04 +0000 (16:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Nov 2011 00:33:04 +0000 (16:33 -0800)
* commit '52607c5364446df6ac5b2f55cb50e146e6023a4f':
  If an error occurs that prevents us from reallocating buffers during a format change

1  2 
media/libstagefright/ACodec.cpp

Simple merge