| commit | b151194ce1cbf77cd9da87ce6fc895278977b0f4 | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Mon Apr 18 20:41:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 18 20:41:58 2016 +0000 |
| tree | d11c4ad0c70dafac059cf62ac00387ebd8c992b3 | |
| parent | 5cc32c5ee9caa11a3c9cd205c42463ead28ec87e [diff] | |
| parent | d059fde3f068700f73970dcce5255efb72c29f13 [diff] |
Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev am: a265388 am: 93cfc25 am: 35ee496 am: d059fde * commit 'd059fde3f068700f73970dcce5255efb72c29f13': SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation. Change-Id: Ifdf3b0bd637332f9962eff593e6086fcd3830c00