am d0307bee: Merge "charger: add locale global variable"

* commit 'd0307beeef57b9db06b82f1ffba746c5decb0b72':
  charger: add locale global variable
This commit is contained in:
Colin Cross 2014-02-13 21:15:42 +00:00 committed by Android Git Automerger
commit 2bcf2437c8
1 changed files with 2 additions and 0 deletions

View File

@ -47,6 +47,8 @@
#include "minui/minui.h"
char *locale;
#ifndef max
#define max(a,b) ((a) > (b) ? (a) : (b))
#endif