commit 47e38865645ffe8bf0a535ace66c541a8af56b5d
author android-build-team Robot <android-build-team-robot@google.com> Mon Jul 23 23:06:46 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jul 23 23:06:46 2018 +0000
tree c890adc84bb6dc47fc4f0969f8d9beb4125b80c3
parent d71f0f1d9d72b3373d0c7977e99f307f1396d2c4
parent d93f993189f1d943bfb395dd3a043b8287350e79

Merge cherrypicks of [4607809, 4607810, 4609855, 4608092, 4608093, 4607931, 4607932, 4609887, 4609888, 4609907, 4609873, 4609874, 4609927, 4609928, 4609967, 4609968, 4609969, 4609970, 4609971, 4607550, 4607551, 4607552, 4607553, 4607554, 4607555, 4607556, 4607557, 4607558, 4607559, 4609929, 4608094, 4608095, 4608096, 4608097, 4608098, 4608099, 4610018, 4610019, 4610047] into pi-dr1-release

Change-Id: I1188a346e70fa3402a1ce5bf61321fbd2781a78f

libmetricslogger/include/metricslogger/metrics_logger.h

diff --git a/libmetricslogger/include/metricslogger/metrics_logger.h b/libmetricslogger/include/metricslogger/metrics_logger.h
index c305db2..88575be 100644
--- a/libmetricslogger/include/metricslogger/metrics_logger.h
+++ b/libmetricslogger/include/metricslogger/metrics_logger.h
@@ -114,7 +114,7 @@
     FIELD_BATTERY_RESISTANCE_UOHMS = 1448,
     FIELD_BATTERY_CURRENT_UA = 1449,
     FIELD_HARDWARE_LOCATION = 1450,
-    ACTION_BATTERY_CAUSED_SHUTDOWN = 1441,
+    ACTION_BATTERY_CAUSED_SHUTDOWN = 1451,
 };
 
 enum {