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

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

am: 35ee496d

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

Change-Id: I9ec2fb9e1d493c28f7356e8bbc305e3a16a19ab3
parents 987974fd 35ee496d
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