resolved conflicts for merge of 1fef485f to master

Change-Id: If402e68292a183064afe35cb77a4437682ee373a
2014-02-13 13:34:37 -08:00 · 2014-02-13 13:34:37 -08:00 · 1c38f5d958
commit 1c38f5d958
parent fb31448b6f 1fef485fcc
1 changed files with 2 additions and 0 deletions
--- 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