aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2017-03-28 15:11:15 -0500
committerTianjie Xu2017-03-28 17:23:40 -0500
commit0a599567ce79a80d8d511505d34fa810b11e034e (patch)
treec0c292e5a1b668d45c3a783abd931e49db3632c3 /recovery.cpp
parent055703e26a70b2b90e6d1f2c50ebf352555048c1 (diff)
downloadplatform-bootable-recovery-0a599567ce79a80d8d511505d34fa810b11e034e.tar.gz
platform-bootable-recovery-0a599567ce79a80d8d511505d34fa810b11e034e.tar.xz
platform-bootable-recovery-0a599567ce79a80d8d511505d34fa810b11e034e.zip
Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9
am: 5ec12126f0 Change-Id: Ia6b861c91958d3be23a4a7456d6d5d8e4a1607c8 (cherry picked from commit 9166f66eee883d6d6cc280a6c355e5528bb4a3f0)
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index c2262161..b24efa96 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -122,7 +122,7 @@ static const int BATTERY_READ_TIMEOUT_IN_SEC = 10;
122static const int BATTERY_OK_PERCENTAGE = 20; 122static const int BATTERY_OK_PERCENTAGE = 20;
123static const int BATTERY_WITH_CHARGER_OK_PERCENTAGE = 15; 123static const int BATTERY_WITH_CHARGER_OK_PERCENTAGE = 15;
124static constexpr const char* RECOVERY_WIPE = "/etc/recovery.wipe"; 124static constexpr const char* RECOVERY_WIPE = "/etc/recovery.wipe";
125static constexpr const char* DEFAULT_LOCALE = "en_US"; 125static constexpr const char* DEFAULT_LOCALE = "en-US";
126 126
127static std::string locale; 127static std::string locale;
128static bool has_cache = false; 128static bool has_cache = false;