diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-06 17:40:43 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-06 17:40:43 +0100 |
| commit | 8bc386657e4bd582ea0897410523e27230a8e157 (patch) | |
| tree | 5850aeac08fed40710b4db0e5f8e8bf03da3a63a /packages/SettingsProvider/res | |
| parent | df6d6764259f800d0a57452ecd487a0643d5dde1 (diff) | |
| parent | ab0b7afb26a80f5af609ccc5fb68e05a97fec901 (diff) | |
| download | frameworks_base-8bc386657e4bd582ea0897410523e27230a8e157.zip frameworks_base-8bc386657e4bd582ea0897410523e27230a8e157.tar.gz frameworks_base-8bc386657e4bd582ea0897410523e27230a8e157.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'packages/SettingsProvider/res')
| -rw-r--r-- | packages/SettingsProvider/res/values/customize.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsProvider/res/values/customize.xml b/packages/SettingsProvider/res/values/customize.xml index b5e6648..9085d2d 100644 --- a/packages/SettingsProvider/res/values/customize.xml +++ b/packages/SettingsProvider/res/values/customize.xml @@ -30,10 +30,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <resources> <!-- Time format,default vlaue is 24 : 24 format,other value is 12 format --> - <string name="def_time_format" translatable="false">24</string> + <string name="def_time_format" translatable="false"></string> <!-- Date format,yyyy-MM-dd: 2013/07/30; MM-dd-yyyy:07/30/2013; dd-MM-yyyy:30/07/2013 --> - <string name="def_date_format" translatable="false">MM-dd-yyyy</string> + <string name="def_date_format" translatable="false"></string> <!-- Default Input Method, its value is from inputmethod's package name and main class name |