| commit | 78f6832bd11ddaa5943a76f62e767896322732f2 | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Wed Dec 12 10:22:32 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 12 10:22:32 2018 -0800 |
| tree | 731c0b25bc2ce17383787e1011184f73aaccee73 | |
| parent | e3092f6eea09dda9e79786219dc13cad5f207752 [diff] | |
| parent | 25a83f0176aa25a34d9fabbe6b59f9eebb1b5b94 [diff] |
Merge "Ignore null-pointer-arithmetic warning from dlmalloc include" am: 25a83f0176 Change-Id: I28e8d63ea5df8f10d3a75c51a490c62d812b9c9a
diff --git a/libmetricslogger/include/metricslogger/metrics_logger.h b/libmetricslogger/include/metricslogger/metrics_logger.h index 56bd6c4..71c04a6 100644 --- a/libmetricslogger/include/metricslogger/metrics_logger.h +++ b/libmetricslogger/include/metricslogger/metrics_logger.h
@@ -116,7 +116,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 {