| commit | 9a4f2665e52215a9a389256a9316d6e4a030337b | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@google.com> | Thu Jun 29 10:10:02 2017 -0400 |
| committer | Chris Wren <cwren@google.com> | Thu Jun 29 10:10:02 2017 -0400 |
| tree | ff89617588623b11e17dc0aabf04a76d1fd50f58 | |
| parent | 693179307c7ac656f5afd877d57532b334ac6f2e [diff] [blame] |
add an auto-merge guard to the metrics constants file Test: make Bug: 63127271 Change-Id: Ib03a14d2a9e321d743a67f72f9be50259ced162a
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 4d9b0dd..9aa58f5 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 }