OSDN Git Service

Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb
authorMarco Nelissen <marcone@google.com>
Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)
commit8c96e87157e7b334be4532fa9f40e28b663db073
treec8c6556bae99bc64029565da0aaed09646b00239
parent9b2197958f08d7943bf8701588add13b65ce16de
parent781d2a7521d15b4a4f1be40c2bdb3314769794e2
Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb
am: 781d2a7521

Change-Id: I3744292b358320f52342a3eb8550ea53afa4be5b
media/libstagefright/MPEG4Extractor.cpp