diff options
| author | Doug Zongker <dougz@google.com> | 2014-03-17 16:11:02 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@google.com> | 2014-03-17 16:11:02 -0700 |
| commit | 80c1a386d3f614919708b37986919ecaf74ee738 (patch) | |
| tree | 2dda152c800117f1f6c7e789c7fb88bd5640f89b /screen_ui.h | |
| parent | 4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49 (diff) | |
| parent | d90da13076303a5377de631623e16c34ee195830 (diff) | |
| download | bootable_recovery-80c1a386d3f614919708b37986919ecaf74ee738.zip bootable_recovery-80c1a386d3f614919708b37986919ecaf74ee738.tar.gz bootable_recovery-80c1a386d3f614919708b37986919ecaf74ee738.tar.bz2 | |
resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp
Change-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30
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 ea7712a..f494e9e 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; |