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

Commit d4018c4b authored by Vinay Kalia's avatar Vinay Kalia
Browse files

resolve merge conflicts of ae16c7e4 to stage-aosp-master 

Merged-In: I75f51146a8c604fed5997f7ad4a77fc89b5b5c44
Merged-In: I8a8492757191c603786f0ca275bacbf63d577459

Test: Verified this conflict resolution.

Change-Id: I0142a236327cc277f348d7188da0807983fc5132
parents 2c7df495 ae16c7e4
Show 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