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

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

am: 93cfc25d

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

Change-Id: Ide6b4c809eee7029fdfc048e1bc590d34979f030
parents f22f681d 93cfc25d
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