OSDN Git Service

am 566c70ca: Guard against codecinfo overflow
authorMarco Nelissen <marcone@google.com>
Mon, 3 Aug 2015 20:03:38 +0000 (20:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Aug 2015 20:03:38 +0000 (20:03 +0000)
* commit '566c70caff87c710e659c5aaad0692e031d93ded':
  Guard against codecinfo overflow

1  2 
media/libstagefright/MetaData.cpp

Simple merge