Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev
This commit is contained in:
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user