commit 9be6e744c4f5113f66751937ce969102f40f3c32
author Todd Kennedy <toddke@google.com> Mon Jan 31 11:14:21 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 31 11:14:21 2011 -0800
tree e86e39e00e8f4887169577b4ae561bebd095be0f
parent c25bc7c53b443119171ad26db4d8ffdcab4ee625
parent 46113f377228dfdc1a6bbc191234f010662f6ddc

am f30faf24: (-s ours) am db0a6017: DO NOT MERGE Ensure foreground colour is set during drag

* commit 'f30faf2462874125f096d90e8a02cfd1470bc52f':
  DO NOT MERGE Ensure foreground colour is set during drag

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 03558a0..2c95dca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -229,6 +229,9 @@
     <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
     <string name="debug_disable_graphics_acceleration_label" translatable="false">
         Disable hardware graphics acceleration</string>
+    <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+    <string name="debug_force_one_minute_refresh_label" translatable="false">
+        Force 1-minute refresh for POP/IMAP</string>
 
     <!-- The text in the small separator between smart folders and the accounts -->
     <string name="account_folder_list_separator_accounts">Accounts</string>