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

Commit 3f783a50 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

resolve merge conflicts of 3b10c39a to stage-aosp-master 

Test: this fixes merge conflict that I skipped
Change-Id: Ie829182b01d01e5ae648165f30cfad7647a97db6
Merged-In: Ie829182b01d01e5ae648165f30cfad7647a97db5
parent f9b00795
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