| commit | a6809b060e60a54f1ca91f22245b7f3ba2126a95 | [log] [tgz] |
|---|---|---|
| author | Hans Boehm <hboehm@google.com> | Fri Aug 17 17:14:47 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 17 17:14:47 2018 -0700 |
| tree | 93ee06f5ceace87115a7c8aab5b886cf5989ba3e | |
| parent | bb1ebf577459ae89bf510910c602601e33d39f0b [diff] | |
| parent | 39ca279282505776620f3e022048857fbc57b7da [diff] |
Merge "Check sp<>::clear() for data races" am: 59cd823752 am: 39ca279282 Change-Id: Ib0e36940d360fbd3e883af3ac2f4c682ad73b684
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 {