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

Skip to content
Commit dc1367d4 authored by Anton Hansson's avatar Anton Hansson
Browse files

resolve merge conflicts of 8e6e52ec to rvc-qpr-dev-plus-aosp 

Bug: 171029603
Change-Id: Ie846f5b9bc1ee906fc6f01d05899fddfd1918266
Merged-In: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
parents 1f419e4d 8e6e52ec
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