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

This commit is contained in:
Chris Wren
2016-06-02 20:28:30 +00:00
committed by Android (Google) Code Review

View File

@@ -2256,6 +2256,8 @@ message MetricsEvent {
// CATEGORY: SETTINGS // CATEGORY: SETTINGS
SETTINGS_GESTURES = 459; SETTINGS_GESTURES = 459;
// ---- End N-MR1 Constants, all N-MR1 constants go above this line ----
// Add new aosp constants above this line. // Add new aosp constants above this line.
// END OF AOSP CONSTANTS // END OF AOSP CONSTANTS
} }