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

Skip to content
Commit c33f5c0e authored by Marco Nelissen's avatar Marco Nelissen Committed by Dang Duy Son
Browse files

resolve merge conflicts of 79cf158c to mnc-dev 

AOSP-Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643

CVE-2017-0558

(cherry picked from commit 50358a80)

Change-Id: Ic2e40c7d6aec8427444a1fd145726e490e994d08
parent 9390a744
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