commit | 525080910efd55df0d562980b6139c0efcc8a47c | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Fri Jul 25 00:31:21 2014 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jul 23 22:55:49 2014 +0000 |
tree | a4770ad1899c1a64e5f23310ed1bd15d618d86d7 | |
parent | 6698ebf92857b7a390264b36603c57ae639b43a2 [diff] | |
parent | 82044f843c17d24839c3c384b08552c908c5b516 [diff] |
Merge "Silence healthd warnings."
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index 688c7ff..fa87274 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp
@@ -37,7 +37,7 @@ namespace android { struct sysfsStringEnumMap { - char* s; + const char* s; int val; };