resolve merge conflicts of cd9ea74 to nyc-mr1-dev
Change-Id: I37bc8256b8b91274f418cbefe2797f068cd98dd4
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index fee8ed9..3a14ad2 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -2212,6 +2212,13 @@
// Notification group expansion state toggled by the expand affordance.
ACTION_NOTIFICATION_GROUP_EXPANDER = 408;
+
+ // Notification expansion state toggled by the expand gesture.
+ ACTION_NOTIFICATION_GESTURE_EXPANDER = 409;
+
+ // Notification group expansion state toggled by the expand gesture.
+ ACTION_NOTIFICATION_GROUP_GESTURE_EXPANDER = 410;
+
// ---- End N Constants, all N constants go above this line ----
// ------- Begin N App Disambig Shade -----