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

Skip to content
Commit 7d2f2059 authored by Aran Ink's avatar Aran Ink Committed by android-build-merger
Browse files

Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev... 

Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd am: 43369ea6
am: 49a40df6

Change-Id: I63ca021b04ffef53d1fff7666923ca002bb2c012
parents 4fc0de74 49a40df6
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