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

Skip to content
Commit c3f2df12 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Harry Youd
Browse files

resolve merge conflicts of 3964c51b to nyc-dev 

Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
AOSP-Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit 0f04a5a9)
CVE-2017-0703

Change-Id: I6c09d8069b84661f761b385c8806bbe48aca155e
parent 1347ed59
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment