resolve merge conflicts of 09c511f to master

Change-Id: I816f248822cb787f5ce35f3184def0f1fe45169e
2016-05-26 11:50:37 -07:00
parent 20198d0592 09c511f039
commit 93ae564ea8
1 changed files with 5 additions and 1 deletions
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -2239,9 +2239,13 @@ message MetricsEvent {
    // CATEGORY: SETTINGS
    STORAGE_MANAGER_SETTINGS = 458;

+    // OPEN: Settings -> Gestures
+    // CATEGORY: SETTINGS
+    SETTINGS_GESTURES = 459;
+
    // ------- Begin N Keyboard Shortcuts Helper -----
    // Keyboard Shortcuts Helper is opened/closed.
-    KEYBOARD_SHORTCUTS_HELPER = 459;
+    KEYBOARD_SHORTCUTS_HELPER = 460;

    // Add new aosp constants above this line.
    // END OF AOSP CONSTANTS