resolve merge conflicts of 54bce9c6ff1f to nyc-mr2-dev-plus-aosp
Change-Id: Ifaea1d0f58ea81a7d929dc891fe69c8d7c15af4e
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index ff3a9c5..9c571a2 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -2247,6 +2247,11 @@
// ---- End N-MR2 Constants, all N-MR2 constants go above this line ----
+ // OPEN: QS NFC tile shown
+ // ACTION: QS NFC tile tapped
+ // CATEGORY: QUICK_SETTINGS
+ QS_NFC = 800;
+
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS
}