| commit | 1fef485fcc307f12b5f4eb1c300012d956ebbf6c | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Feb 13 21:19:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 13 21:19:16 2014 +0000 |
| tree | 4de3690c4176122901e2e828ebde64374e9b0016 | |
| parent | c5f3e0dc092a3132b93d6784103c089ea9cf12ce [diff] | |
| parent | 2bcf2437c80dbb1d7520b2a5688d4ad7b38dad51 [diff] |
am 2bcf2437: am d0307bee: Merge "charger: add locale global variable" * commit '2bcf2437c80dbb1d7520b2a5688d4ad7b38dad51': 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