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

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

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

Change-Id: Ib9f67677abf99a315669975a386d615fe682a954
parents 20f9cec4 a265388a
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