Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit c59e36ea authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of 87695f66 to mnc-dev" into mnc-dev am: a265388a... 

Merge "resolve merge conflicts of 87695f66 to mnc-dev" into mnc-dev am: a265388a am: 93cfc25d am: 35ee496d am: d059fde3
am: b151194c

* commit 'b151194c':
  SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I35baa29d0b7aabf5a395d1b767fecf6f9bebad16
parents 95f3338a b151194c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment