Commit 5590c561 authored by Aran Ink's avatar Aran Ink
Browse files

Fix conflict between metrics_constants and settings_enums. 

Change-Id: I483bf6b26f2f258f2e2f6f3d839deee4953c203d
Test: Automated tests pass.
Fixes: 135720071
(cherry picked from commit 08659ccdb72b4c578e4b83fcc9e549a9c27f4b75)
parent c65d4b72
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment