aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker2014-03-17 18:33:14 -0500
committerAndroid Git Automerger2014-03-17 18:33:14 -0500
commita68c517c628acdcfd0107536f34c3fd882ce0629 (patch)
treebf08d4b39df094d50b0b671297b2fb807f5f40f8 /screen_ui.h
parent76b245c24c12feec2381c423de2f7ffe4b78d7f0 (diff)
parent80c1a386d3f614919708b37986919ecaf74ee738 (diff)
downloadplatform-bootable-recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.tar.gz
platform-bootable-recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.tar.xz
platform-bootable-recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.zip
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 '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 0221ff25..92e4795b 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;