tree 5db3008601445341a4a1f365ab4668cb64cadda6
parent e4a6ca723154210dd5355da994e150afa6da82f3
parent 985f21dd43694c0f22b863a85604a63b2d42c475
author Aran Ink <nesciosquid@google.com> 1561155509 -0700
committer android-build-merger <android-build-merger@google.com> 1561155509 -0700

Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev
am: 985f21dd43

Change-Id: I3c148d970cb95a4de752270ca6bbe6e5db2d77d1