| commit | 2bcf2437c80dbb1d7520b2a5688d4ad7b38dad51 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Feb 13 21:15:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 13 21:15:42 2014 +0000 |
| tree | c37d877fa8c98e8a852e0687627124422a62c4d9 | |
| parent | 594f0917000de7cc8bd8f184eede96a17cafd777 [diff] | |
| parent | d0307beeef57b9db06b82f1ffba746c5decb0b72 [diff] |
am d0307bee: Merge "charger: add locale global variable" * commit 'd0307beeef57b9db06b82f1ffba746c5decb0b72': charger: add locale global variable
diff --git a/charger/charger.c b/charger/charger.c index 66ddeaf..8f9169d 100644 --- a/charger/charger.c +++ b/charger/charger.c
@@ -47,6 +47,8 @@ #include "minui/minui.h" +char *locale; + #ifndef max #define max(a,b) ((a) > (b) ? (a) : (b)) #endif