DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: Id4f4f66ffb8104d953957f1c44dff6f549a387bb

libmetricslogger/include/metricslogger/metrics_logger.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ enum {
		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 {