Merge "Fixing the metrics_constants jump" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-05-18 04:15:20 +00:00
committed by Android (Google) Code Review

View File

@@ -7293,15 +7293,13 @@ message MetricsEvent {
// ACTION: Settings > Initialize Search bar > Verify Slice > Other exception
ACTION_VERIFY_SLICE_OTHER_EXCEPTION = 1727;
// ---- Skipping ahead to avoid conflicts between master and release branches.
// OPEN: Settings > System > Gestures > Global Actions Panel
// CATEGORY: SETTINGS
// OS: Q
GLOBAL_ACTIONS_PANEL_SETTINGS = 1800;
GLOBAL_ACTIONS_PANEL_SETTINGS = 1728;
// ---- End Q Constants, all Q constants go above this line ----
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS
}
}
}