Fix build breakage caused by proto conflict
Two proto constants were merged at the same time,
causing a conflict.
Test: none
Change-Id: If429fc28d8f2c37c19945a7cffe1147770ea447d
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index abcfec1..01714cf 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -5172,11 +5172,6 @@
// Package: Package of the autofill service
// OS: P
AUTOFILL_INVALID_PERMISSION = 1289;
-
- // OPEN: Settings->Connected Devices->USB->(click on details link)
- // CATEGORY: SETTINGS
- // OS: P
- USB_DEVICE_DETAILS = 1290;
// OPEN: QS Alarm tile shown
// ACTION: QS Alarm tile tapped
@@ -5185,6 +5180,11 @@
// OS: P
QS_ALARM = 1290;
+ // OPEN: Settings->Connected Devices->USB->(click on details link)
+ // CATEGORY: SETTINGS
+ // OS: P
+ USB_DEVICE_DETAILS = 1291;
+
// ---- End P Constants, all P constants go above this line ----
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS