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