diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-11 05:04:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 05:04:40 +0000 |
| commit | b6131acd69ea32df926125d94c16174bc0ce1d4a (patch) | |
| tree | c00bfb87c8de5f5cd05d7275fa8d14afc76b800d /media/libstagefright/id3/ID3.cpp | |
| parent | 2abbc048837182bda04037f53309cde4c73f017d (diff) | |
| parent | 94f8150be2041f73c2f185f2c3622a9537d47454 (diff) | |
| download | frameworks_av-b6131acd69ea32df926125d94c16174bc0ce1d4a.zip frameworks_av-b6131acd69ea32df926125d94c16174bc0ce1d4a.tar.gz frameworks_av-b6131acd69ea32df926125d94c16174bc0ce1d4a.tar.bz2 | |
am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev
* commit '94f8150be2041f73c2f185f2c3622a9537d47454':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Diffstat (limited to 'media/libstagefright/id3/ID3.cpp')
0 files changed, 0 insertions, 0 deletions