Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev

    // CATEGORY: SETTINGS

    SETTINGS_GESTURES = 459;

    // ---- End N-MR1 Constants, all N-MR1 constants go above this line ----

    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS

  }