aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker2014-03-17 18:11:02 -0500
committerDoug Zongker2014-03-17 18:11:02 -0500
commit80c1a386d3f614919708b37986919ecaf74ee738 (patch)
tree2dda152c800117f1f6c7e789c7fb88bd5640f89b /screen_ui.h
parent4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49 (diff)
parentd90da13076303a5377de631623e16c34ee195830 (diff)
downloadplatform-bootable-recovery-80c1a386d3f614919708b37986919ecaf74ee738.tar.gz
platform-bootable-recovery-80c1a386d3f614919708b37986919ecaf74ee738.tar.xz
platform-bootable-recovery-80c1a386d3f614919708b37986919ecaf74ee738.zip
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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/screen_ui.h b/screen_ui.h
index ea7712a3..f494e9e2 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;