diff options
| author | Colin Cross <ccross@android.com> | 2014-02-13 13:34:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-02-13 13:34:37 -0800 |
| commit | 1c38f5d9587396288997a568a01b2faa79ce1613 (patch) | |
| tree | 9ef657243779612b40d575360afc3c02cb40f6d6 /healthd | |
| parent | fb31448b6fbf366149ddddefdc8e87c77452730c (diff) | |
| parent | 1fef485fcc307f12b5f4eb1c300012d956ebbf6c (diff) | |
| download | system_core-1c38f5d9587396288997a568a01b2faa79ce1613.zip system_core-1c38f5d9587396288997a568a01b2faa79ce1613.tar.gz system_core-1c38f5d9587396288997a568a01b2faa79ce1613.tar.bz2 | |
resolved conflicts for merge of 1fef485f to master
Change-Id: If402e68292a183064afe35cb77a4437682ee373a
Diffstat (limited to 'healthd')
| -rw-r--r-- | healthd/healthd_mode_charger.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp index 025d530..33a179b 100644 --- a/healthd/healthd_mode_charger.cpp +++ b/healthd/healthd_mode_charger.cpp @@ -45,6 +45,8 @@ #include "healthd.h" +char *locale; + #ifndef max #define max(a,b) ((a) > (b) ? (a) : (b)) #endif |