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

Skip to content
Commit 49a40df6 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 am: 985f21dd 

am: 43369ea6

Change-Id: I7ae7a7d7d4ad2ea593ef01c6ed03bd161b5d5d0b
parents 89e543fe 43369ea6
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