resolve merge conflicts of 8b3cb1b to nyc-mr1-dev

Change-Id: Ifc87af6444612f67cace41da9bb96d3283cf33b2
2016-05-11 11:35:46 -04:00
parent 9550f5dfa6 8b3cb1b2ff
commit d0ea9bafaa
1 changed files with 3 additions and 0 deletions
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -2200,6 +2200,9 @@ message MetricsEvent {
    // Settings -> Dev options -> Running services
    RUNNING_SERVICES = 404;

+    // The dialog shown by 3P intent to change current webview implementation.
+    WEBVIEW_IMPLEMENTATION = 405;
+
    // ---- End N Constants, all N constants go above this line ----

    // ------- Begin N App Disambig Shade -----