tree 5fa0b9c86e7c7baf5192bc7dc7f393cfc4924e05
parent c1fe2634dc228640119849692cd1defb88bc2209
parent db22689ffaf082709bcaa323d70300a7959d6eb8
author Chong Zhang <chz@google.com> 1500418367 +0000
committer android-build-merger <android-build-merger@google.com> 1500418367 +0000

Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789 am: e1e8ea6a19 am: a29bd6a709 am: d7c144c545 am: 3fd727d787 am: 33e76e05a3 am: dfd2808073
am: db22689ffa

Change-Id: Ic7105fcbfa58d46d0c33d8e8c26c6ad9cc44c960