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

Skip to content
Commit b151194c 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

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

Change-Id: Ifdf3b0bd637332f9962eff593e6086fcd3830c00
parents 5cc32c5e d059fde3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment