aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker2014-03-17 18:13:08 -0500
committerDoug Zongker2014-03-17 18:13:08 -0500
commitc4025e90f4e73bd9bf9665000276663e35c0066b (patch)
treef103aef739b9715fd1546b060e132a39a071a4af /screen_ui.h
parent52d0b765ab58e7def9783623092f1891a4d7f427 (diff)
parentd90da13076303a5377de631623e16c34ee195830 (diff)
downloadplatform-bootable-recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.tar.gz
platform-bootable-recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.tar.xz
platform-bootable-recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.zip
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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/screen_ui.h b/screen_ui.h
index aa114a4d..532269f8 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -63,6 +63,7 @@ class ScreenRecoveryUI : public RecoveryUI {
63 private: 63 private:
64 Icon currentIcon; 64 Icon currentIcon;
65 int installingFrame; 65 int installingFrame;
66 const char* locale;
66 bool rtl_locale; 67 bool rtl_locale;
67 68
68 pthread_mutex_t updateMutex; 69 pthread_mutex_t updateMutex;