| commit | 35ee496debc05431eb00d83ced6d312d39648131 | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Mon Apr 18 20:26:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 18 20:26:04 2016 +0000 |
| tree | 54fbaa8559ee6af9f819508f9fe26a5936656b5e | |
| parent | f22f681d5cf79fbcfbaa5572ffbc106d414cabe4 [diff] | |
| parent | 93cfc25deb117d6724aaf01be92054884178b7f2 [diff] |
Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev am: a265388 am: 93cfc25 * commit '93cfc25deb117d6724aaf01be92054884178b7f2': SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation. Change-Id: Ide6b4c809eee7029fdfc048e1bc590d34979f030