diff options
| author | Doug Zongker <dougz@google.com> | 2014-03-17 23:33:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-17 23:33:14 +0000 |
| commit | a68c517c628acdcfd0107536f34c3fd882ce0629 (patch) | |
| tree | bf08d4b39df094d50b0b671297b2fb807f5f40f8 /screen_ui.h | |
| parent | 76b245c24c12feec2381c423de2f7ffe4b78d7f0 (diff) | |
| parent | 80c1a386d3f614919708b37986919ecaf74ee738 (diff) | |
| download | bootable_recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.zip bootable_recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.tar.gz bootable_recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.tar.bz2 | |
am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp
* commit '80c1a386d3f614919708b37986919ecaf74ee738':
refactor image resource loading code in minui
Diffstat (limited to 'screen_ui.h')
| -rw-r--r-- | screen_ui.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/screen_ui.h b/screen_ui.h index 0221ff2..92e4795 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -63,6 +63,7 @@ class ScreenRecoveryUI : public RecoveryUI { private: Icon currentIcon; int installingFrame; + const char* locale; bool rtl_locale; pthread_mutex_t updateMutex; |