From 741d0002cdd062d949a88b5b81a3dba7d3115198 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 22 Nov 2017 04:30:33 +0000
Subject: [PATCH] Revert "Add a wrapper ConfigMetricReportList to hold multiple
 ConfigMetricReports"

This reverts commit 24904b845f6257f3d6be5374a1e11d67715034c6.

Broke the build when combined with Ia58d215d30ed7570c0aa1b0627d3b88f8355d425.

Change-Id: Ie54a62ec7471e0183fc2627e06648efda0129a7a
---
 cmds/statsd/src/stats_log.proto | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto
index fd795e83bd77d..4f5df55128475 100644
--- a/cmds/statsd/src/stats_log.proto
+++ b/cmds/statsd/src/stats_log.proto
@@ -158,17 +158,13 @@ message StatsLogReport {
 }
 
 message ConfigMetricsReport {
-  repeated StatsLogReport metrics = 1;
-
-  optional UidMapping uid_map = 2;
-}
-
-message ConfigMetricsReportList {
   message ConfigKey {
     optional int32 uid = 1;
     optional string name = 2;
   }
   optional ConfigKey config_key = 1;
 
-  repeated ConfigMetricsReport reports = 2;
+  repeated StatsLogReport metrics = 2;
+
+  optional UidMapping uid_map = 3;
 }