commit 6343cb5acd6b375cd4e2129e5709ee765e421f48
author Chris Wren <cwren@android.com> Thu Jun 02 17:04:35 2016 -0400
committer Chris Wren <cwren@android.com> Thu Jun 02 17:04:35 2016 -0400
tree e92f9043917665f9cc7cdee49ca993b239210721
parent 91b43d50fd5ee7bd89cace7f849e298c13f57f7d
parent 18455a9108f36e6577f2eebdbeb7781a0ad4751f

resolve merge conflicts of 18455a9 to master

Change-Id: I06da8fa1601633baad82be50ae881462d33ff27e

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index e928753..2ea5ce4 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -2256,6 +2256,8 @@
     // CATEGORY: SETTINGS
     SETTINGS_GESTURES = 459;
 
+    // ---- End N-MR1 Constants, all N-MR1 constants go above this line ----
+
     // ------- Begin N Keyboard Shortcuts Helper -----
     // Keyboard Shortcuts Helper is opened/closed.
     KEYBOARD_SHORTCUTS_HELPER = 460;