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