tree 1d99303cec3093f455b6c31504348a9e5465b08f
parent 67a69ea56423af97a91cac876d10a447cdc21254
parent 865b5dc8ad88387dda2b9d39fcaf7bde663386bd
author Chong Zhang <chz@google.com> 1500418894 +0000
committer android-build-merger <android-build-merger@google.com> 1500418894 +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 am: 9ada6f85bf
am: 865b5dc8ad

Change-Id: I100a7f4db5df765ec151ee63dc0951a64fcb1d21