commit | 3c763915504156b2d7d1763ce36d79df7de95254 | [log] [tgz] |
---|---|---|
author | Pawin Vongmasa <pawin@google.com> | Thu Oct 13 01:27:01 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 01:27:01 2016 +0000 |
tree | de9ed7424fb04972996f6419c5b0aa33f6f5d5c6 | |
parent | 7e8c500e2c08aedc9de3bc11c8063d0c7efd71c8 [diff] | |
parent | fe97b3979557d6f18555e4e9d8c991da8b2df237 [diff] |
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am: b6ba3d7e47 -s ours am: 37e3ea354a am: ea136eb981 -s ours am: 2456e12801 am: fe97b39795 Change-Id: I4d2a011145b4660d078e2e7d47ffb0fc2489a49a