From 7914797d02c166801a6f12713bdc253bf0430534 Mon Sep 17 00:00:00 2001
From: Jerry Zhang <zhangjerry@google.com>
Date: Wed, 31 Jan 2018 16:04:06 -0800
Subject: [PATCH] Fix build breakage caused by proto conflict

Two proto constants were merged at the same time,
causing a conflict.

Test: none
Change-Id: If429fc28d8f2c37c19945a7cffe1147770ea447d
---
 proto/src/metrics_constants.proto | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index abcfec1e6c136..01714cf571b50 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -5172,11 +5172,6 @@ message MetricsEvent {
     // 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 @@ message MetricsEvent {
     // 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