commit | 6a21e6ca3f2d198b1cc7165b386c3fa579169bb9 | [log] [tgz] |
---|---|---|
author | Pawin Vongmasa <pawin@google.com> | Thu Oct 13 01:55:04 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 01:55:04 2016 +0000 |
tree | f503423f2005a41e7fc058600a243b1c26c7d3db | |
parent | c8ce691ddbcddb91a05c0b22ddce8893fe7a262a [diff] | |
parent | c8a7c1a69dfaac61a4d892f74acc755424a41685 [diff] |
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235 am: b512f4ab42 am: d18d8fac61 -s ours am: 54c0001dc9 -s ours am: 253e3ae0ba am: 42e8d24ca9 -s ours am: 0bed5b7803 am: 682bb8b4fa am: c8a7c1a69d Change-Id: Icb431985d1ea91d2d10ed400a67ede7abd9cf434