commit | 93569567427fe8484d1bf57f547cc18daf6ef65b | [log] [tgz] |
---|---|---|
author | Pawin Vongmasa <pawin@google.com> | Thu Oct 13 01:48:10 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 01:48:10 2016 +0000 |
tree | 7c8ec851cc9c01b16b7a4d2e1fccba637a55354e | |
parent | f14129fd502bdb862fcbbdc1c2c7ac11f909c132 [diff] | |
parent | 0e4feca95e5d71cac1f1177e8de5a2c06f9e39f7 [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 am: 3c76391550 am: 1099791bd6 -s ours am: 0e4feca95e Change-Id: I9e31ee0f22e3c1f39ddf2653ca440d0e2c8ea09d