diff options
| author | Doug Zongker <dougz@google.com> | 2014-03-17 16:13:08 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@google.com> | 2014-03-17 16:13:08 -0700 |
| commit | c4025e90f4e73bd9bf9665000276663e35c0066b (patch) | |
| tree | f103aef739b9715fd1546b060e132a39a071a4af /screen_ui.h | |
| parent | 52d0b765ab58e7def9783623092f1891a4d7f427 (diff) | |
| parent | d90da13076303a5377de631623e16c34ee195830 (diff) | |
| download | bootable_recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.zip bootable_recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.tar.gz bootable_recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.tar.bz2 | |
resolved conflicts for merge of d90da130 to klp-dev-plus-aosp
Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0
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 aa114a4..532269f 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; |