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 /recovery.cpp | |
| 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 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp index c28e328..b2cdf08 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -986,6 +986,7 @@ main(int argc, char **argv) { ui = device->GetUI(); gCurrentUI = ui; + ui->SetLocale(locale); ui->Init(); int st_cur, st_max; @@ -993,7 +994,6 @@ main(int argc, char **argv) { ui->SetStage(st_cur, st_max); } - ui->SetLocale(locale); ui->SetBackground(RecoveryUI::NONE); if (show_text) ui->ShowText(true); |