Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev

This commit is contained in:
TreeHugger Robot
2017-06-29 16:49:46 +00:00
committed by Android (Google) Code Review

View File

@@ -4190,6 +4190,8 @@ message MetricsEvent {
// OS: O DR // OS: O DR
FIELD_TIME_ELAPSED_BETWEEN_CHARGE_MS = 1030; 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. // Add new aosp constants above this line.
// END OF AOSP CONSTANTS // END OF AOSP CONSTANTS
} }