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