From 9a4f2665e52215a9a389256a9316d6e4a030337b Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@google.com>
Date: Thu, 29 Jun 2017 10:10:02 -0400
Subject: [PATCH] add an auto-merge guard to the metrics constants file

Test: make
Bug: 63127271
Change-Id: Ib03a14d2a9e321d743a67f72f9be50259ced162a
---
 proto/src/metrics_constants.proto | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 4d9b0ddde14b6..9aa58f5016029 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -4190,6 +4190,8 @@ message MetricsEvent {
     // OS: O DR
     FIELD_TIME_ELAPSED_BETWEEN_CHARGE_MS = 1030;
 
+    // ---- End O-DR1 Constants, all O-DR1 constants go above this line ----
+
     // Add new aosp constants above this line.
     // END OF AOSP CONSTANTS
   }