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

am: cf665232f3

* commit 'cf665232f332faa4d3c0c6247c6e5685684a1b2a':
  Give the auto-merger somthing to hang on to.

Change-Id: I7ee4ae7df89504ab53eb2829ca90243baa2aef65

proto/src/metrics_constants.proto

@@ -2256,6 +2256,8 @@ message MetricsEvent {
     // 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
   }