Commit b3be57b7 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

Change-Id: I9e279d5ccae2ce43a30e217bccd34df3a200285e
parents 46cb9bed 985f21dd
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