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

Commit eb0cc22d authored by Jason Monk's avatar Jason Monk
Browse files

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

Change-Id: If816cf965ec4d599560fe172bd1912db57c3c7d9
parents 8f0acaf0 d0ea9baf
Loading
Loading
Loading
Loading
+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 -----