commit 677c0db1136c8464445d1d7dfd96991d03fbbfd9
author Chris Wren <cwren@google.com> Thu Jun 29 17:07:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 29 17:07:17 2017 +0000
tree 6b1b6a3eb885e9c8795fc48b4d24925731bb25d7
parent 2e50200c016b05eb1abb6e8007b161f5e901ac70
parent d0a0cb32bf42671da4f5089feca05e3728bd0d0c

Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev am: 325706f143
am: d0a0cb32bf

Change-Id: Ie3a0c67fd2ce92098771b3fff27f61db016f2828

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index c6e3ed5..c1a1901 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -4190,6 +4190,8 @@
     // 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
   }