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

Commit c79d9148 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

resolve merge conflicts of d0ea9baf to nyc-mr1-dev-plus-aosp 

am: eb0cc22d

* commit 'eb0cc22d':

Change-Id: Ifea7e06258bcb76c5faa5846b99f3f68148fcd5b
parents a6dac189 eb0cc22d

proto/src/metrics_constants.proto

+3 −0
Original line number Diff line number Diff line
@@ -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 -----