From b12b61a88a029730b1f2b006ff914c9c719f3942 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 25 Jul 2012 17:30:24 -0700
Subject: [PATCH] Use ICU's CLDR data for "AM" and "PM" strings.

This brings DateUtils and Time in sync with bionic, icu, WebKit,
DateFormatSymbols, Formatter, and SimpleDateFormat. And specifically
means that DateUtils now knows how to say "AM" and "PM" in Japanese.

Bug: 6719054
Change-Id: Icdd75c0865505fde4115d71025eeb7515b73da4c
---
 core/java/android/text/format/DateUtils.java       | 9 +++------
 core/java/android/text/format/Time.java            | 8 ++++++--
 core/res/res/values-af/donottranslate-cldr.xml     | 3 ---
 core/res/res/values-am/donottranslate-cldr.xml     | 3 ---
 core/res/res/values-ar-rEG/donottranslate-cldr.xml | 2 --
 core/res/res/values-ar/donottranslate-cldr.xml     | 2 --
 core/res/res/values-be/donottranslate-cldr.xml     | 2 --
 core/res/res/values-bg/donottranslate-cldr.xml     | 2 --
 core/res/res/values-ca-rES/donottranslate-cldr.xml | 2 --
 core/res/res/values-ca/donottranslate-cldr.xml     | 2 --
 core/res/res/values-cs/donottranslate-cldr.xml     | 2 --
 core/res/res/values-da/donottranslate-cldr.xml     | 2 --
 core/res/res/values-de/donottranslate-cldr.xml     | 2 --
 core/res/res/values-el/donottranslate-cldr.xml     | 2 --
 core/res/res/values-en-rAU/donottranslate-cldr.xml | 2 --
 core/res/res/values-en-rCA/donottranslate-cldr.xml | 2 --
 core/res/res/values-en-rGB/donottranslate-cldr.xml | 2 --
 core/res/res/values-en-rIE/donottranslate-cldr.xml | 2 --
 core/res/res/values-en-rIN/donottranslate-cldr.xml | 2 --
 core/res/res/values-en-rNZ/donottranslate-cldr.xml | 2 --
 core/res/res/values-en-rUS/donottranslate-cldr.xml | 2 --
 core/res/res/values-en-rZA/donottranslate-cldr.xml | 2 --
 core/res/res/values-es-rUS/donottranslate-cldr.xml | 2 --
 core/res/res/values-es/donottranslate-cldr.xml     | 2 --
 core/res/res/values-et/donottranslate-cldr.xml     | 2 --
 core/res/res/values-fa/donottranslate-cldr.xml     | 2 --
 core/res/res/values-fi-rFI/donottranslate-cldr.xml | 2 --
 core/res/res/values-fi/donottranslate-cldr.xml     | 2 --
 core/res/res/values-fr/donottranslate-cldr.xml     | 2 --
 core/res/res/values-hi-rIN/donottranslate-cldr.xml | 2 --
 core/res/res/values-hi/donottranslate-cldr.xml     | 2 --
 core/res/res/values-hr-rHR/donottranslate-cldr.xml | 2 --
 core/res/res/values-hr/donottranslate-cldr.xml     | 2 --
 core/res/res/values-hu-rHU/donottranslate-cldr.xml | 2 --
 core/res/res/values-hu/donottranslate-cldr.xml     | 2 --
 core/res/res/values-in-rID/donottranslate-cldr.xml | 2 --
 core/res/res/values-in/donottranslate-cldr.xml     | 2 --
 core/res/res/values-it/donottranslate-cldr.xml     | 2 --
 core/res/res/values-iw/donottranslate-cldr.xml     | 2 --
 core/res/res/values-ja/donottranslate-cldr.xml     | 2 --
 core/res/res/values-ko/donottranslate-cldr.xml     | 2 --
 core/res/res/values-lt-rLT/donottranslate-cldr.xml | 2 --
 core/res/res/values-lt/donottranslate-cldr.xml     | 2 --
 core/res/res/values-lv-rLV/donottranslate-cldr.xml | 2 --
 core/res/res/values-lv/donottranslate-cldr.xml     | 2 --
 core/res/res/values-ms/donottranslate-cldr.xml     | 2 --
 core/res/res/values-nb/donottranslate-cldr.xml     | 2 --
 core/res/res/values-nl/donottranslate-cldr.xml     | 2 --
 core/res/res/values-pl/donottranslate-cldr.xml     | 2 --
 core/res/res/values-pt-rPT/donottranslate-cldr.xml | 2 --
 core/res/res/values-pt/donottranslate-cldr.xml     | 2 --
 core/res/res/values-ro-rRO/donottranslate-cldr.xml | 2 --
 core/res/res/values-ro/donottranslate-cldr.xml     | 2 --
 core/res/res/values-ru/donottranslate-cldr.xml     | 2 --
 core/res/res/values-sk-rSK/donottranslate-cldr.xml | 2 --
 core/res/res/values-sk/donottranslate-cldr.xml     | 2 --
 core/res/res/values-sl-rSI/donottranslate-cldr.xml | 2 --
 core/res/res/values-sl/donottranslate-cldr.xml     | 2 --
 core/res/res/values-sr-rRS/donottranslate-cldr.xml | 2 --
 core/res/res/values-sr/donottranslate-cldr.xml     | 2 --
 core/res/res/values-sv/donottranslate-cldr.xml     | 2 --
 core/res/res/values-sw/donottranslate-cldr.xml     | 2 --
 core/res/res/values-th-rTH/donottranslate-cldr.xml | 2 --
 core/res/res/values-th/donottranslate-cldr.xml     | 2 --
 core/res/res/values-tl/donottranslate-cldr.xml     | 2 --
 core/res/res/values-tr/donottranslate-cldr.xml     | 2 --
 core/res/res/values-uk-rUA/donottranslate-cldr.xml | 2 --
 core/res/res/values-uk/donottranslate-cldr.xml     | 2 --
 core/res/res/values-vi-rVN/donottranslate-cldr.xml | 2 --
 core/res/res/values-vi/donottranslate-cldr.xml     | 2 --
 core/res/res/values-zh-rCN/donottranslate-cldr.xml | 2 --
 core/res/res/values-zh-rTW/donottranslate-cldr.xml | 2 --
 core/res/res/values-zu/donottranslate-cldr.xml     | 2 --
 core/res/res/values/donottranslate-cldr.xml        | 2 --
 core/res/res/values/public.xml                     | 2 --
 75 files changed, 9 insertions(+), 156 deletions(-)

diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java
index da103111a8ffb..b7ae35dc9d6ca 100644
--- a/core/java/android/text/format/DateUtils.java
+++ b/core/java/android/text/format/DateUtils.java
@@ -29,6 +29,8 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import libcore.icu.LocaleData;
+
 /**
  * This class contains various date-related utilities for creating text for things like
  * elapsed time and date ranges, strings for days of the week and months, and AM/PM text etc.
@@ -128,10 +130,6 @@ public class DateUtils
             com.android.internal.R.string.month_shortest_november,
             com.android.internal.R.string.month_shortest_december,
         };
-    private static final int[] sAmPm = new int[] {
-            com.android.internal.R.string.am,
-            com.android.internal.R.string.pm,
-        };
     private static Configuration sLastConfig;
     private static java.text.DateFormat sStatusTimeFormat;
     private static String sElapsedFormatMMSS;
@@ -332,8 +330,7 @@ public class DateUtils
      * @return Localized version of "AM" or "PM".
      */
     public static String getAMPMString(int ampm) {
-        Resources r = Resources.getSystem();
-        return r.getString(sAmPm[ampm - Calendar.AM]);
+        return LocaleData.get(Locale.getDefault()).amPm[ampm - Calendar.AM];
     }
 
     /**
diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java
index e9b0d325d2577..43750d407e6a2 100644
--- a/core/java/android/text/format/Time.java
+++ b/core/java/android/text/format/Time.java
@@ -21,6 +21,8 @@ import android.content.res.Resources;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import libcore.icu.LocaleData;
+
 /**
  * An alternative to the {@link java.util.Calendar} and
  * {@link java.util.GregorianCalendar} classes. An instance of the Time class represents
@@ -382,8 +384,10 @@ public class Time {
                 sTimeOnlyFormat = r.getString(com.android.internal.R.string.time_of_day);
                 sDateOnlyFormat = r.getString(com.android.internal.R.string.month_day_year);
                 sDateTimeFormat = r.getString(com.android.internal.R.string.date_and_time);
-                sAm = r.getString(com.android.internal.R.string.am);
-                sPm = r.getString(com.android.internal.R.string.pm);
+
+                LocaleData localeData = LocaleData.get(locale);
+                sAm = localeData.amPm[0];
+                sPm = localeData.amPm[1];
 
                 sLocale = locale;
             }
diff --git a/core/res/res/values-af/donottranslate-cldr.xml b/core/res/res/values-af/donottranslate-cldr.xml
index 9d38717a5731b..a3d8b9c8e81e6 100644
--- a/core/res/res/values-af/donottranslate-cldr.xml
+++ b/core/res/res/values-af/donottranslate-cldr.xml
@@ -85,9 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">vm.</string>
-    <string name="pm">nm.</string>
-
     <string name="hour_minute_24">%-k:%M</string>
     <string name="hour_minute_ampm">%-l:%M %p</string>
     <string name="hour_minute_cap_ampm">%-l:%M %^p</string>
diff --git a/core/res/res/values-am/donottranslate-cldr.xml b/core/res/res/values-am/donottranslate-cldr.xml
index 2319fbf50b4b2..7d8b7be2e3a41 100644
--- a/core/res/res/values-am/donottranslate-cldr.xml
+++ b/core/res/res/values-am/donottranslate-cldr.xml
@@ -85,9 +85,6 @@
     <string name="day_of_week_shortest_friday">ዓ</string>
     <string name="day_of_week_shortest_saturday">ቅ</string>
 
-    <string name="am">ጡዋት</string>
-    <string name="pm">ከሳዓት</string>
-
     <string name="hour_minute_24">%-k:%M</string>
     <string name="hour_minute_ampm">%-l:%M %p</string>
     <string name="hour_minute_cap_ampm">%-l:%M %p</string>
diff --git a/core/res/res/values-ar-rEG/donottranslate-cldr.xml b/core/res/res/values-ar-rEG/donottranslate-cldr.xml
index 57011d7683b2c..31172e78bb4a6 100644
--- a/core/res/res/values-ar-rEG/donottranslate-cldr.xml
+++ b/core/res/res/values-ar-rEG/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">ج</string>
     <string name="day_of_week_shortest_saturday">س</string>
 
-    <string name="am">ص</string>
-    <string name="pm">م</string>
     <string name="yesterday">أمس</string>
     <string name="today">اليوم</string>
     <string name="tomorrow">غدًا</string>
diff --git a/core/res/res/values-ar/donottranslate-cldr.xml b/core/res/res/values-ar/donottranslate-cldr.xml
index 0b9da23b765d6..7ee1ee7845862 100644
--- a/core/res/res/values-ar/donottranslate-cldr.xml
+++ b/core/res/res/values-ar/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">ج</string>
     <string name="day_of_week_shortest_saturday">س</string>
 
-    <string name="am">ص</string>
-    <string name="pm">م</string>
     <string name="yesterday">أمس</string>
     <string name="today">اليوم</string>
     <string name="tomorrow">غدًا</string>
diff --git a/core/res/res/values-be/donottranslate-cldr.xml b/core/res/res/values-be/donottranslate-cldr.xml
index 365e60d1f8dcb..c0f85ddc9768d 100644
--- a/core/res/res/values-be/donottranslate-cldr.xml
+++ b/core/res/res/values-be/donottranslate-cldr.xml
@@ -74,8 +74,6 @@
     <string name="day_of_week_shortest_friday">п</string>
     <string name="day_of_week_shortest_saturday">с</string>
 
-    <string name="am">да палудня</string>
-    <string name="pm">пасля палудня</string>
     <string name="yesterday">учора</string>
     <string name="today">сёння</string>
     <string name="tomorrow">заўтра</string>
diff --git a/core/res/res/values-bg/donottranslate-cldr.xml b/core/res/res/values-bg/donottranslate-cldr.xml
index 972d661af4f74..7e59f2b5d542d 100644
--- a/core/res/res/values-bg/donottranslate-cldr.xml
+++ b/core/res/res/values-bg/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">п</string>
     <string name="day_of_week_shortest_saturday">с</string>
 
-    <string name="am">пр. об.</string>
-    <string name="pm">сл. об.</string>
     <string name="yesterday">Вчера</string>
     <string name="today">Днес</string>
     <string name="tomorrow">Утре</string>
diff --git a/core/res/res/values-ca-rES/donottranslate-cldr.xml b/core/res/res/values-ca-rES/donottranslate-cldr.xml
index 113133dc71e45..a8a18252c45b4 100644
--- a/core/res/res/values-ca-rES/donottranslate-cldr.xml
+++ b/core/res/res/values-ca-rES/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">v</string>
     <string name="day_of_week_shortest_saturday">s</string>
 
-    <string name="am">a.m.</string>
-    <string name="pm">p.m.</string>
     <string name="yesterday">ahir</string>
     <string name="today">avui</string>
     <string name="tomorrow">demà</string>
diff --git a/core/res/res/values-ca/donottranslate-cldr.xml b/core/res/res/values-ca/donottranslate-cldr.xml
index 03cf69dcfd56e..3089ad62c7416 100644
--- a/core/res/res/values-ca/donottranslate-cldr.xml
+++ b/core/res/res/values-ca/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">v</string>
     <string name="day_of_week_shortest_saturday">s</string>
 
-    <string name="am">a.m.</string>
-    <string name="pm">p.m.</string>
     <string name="yesterday">ahir</string>
     <string name="today">avui</string>
     <string name="tomorrow">demà</string>
diff --git a/core/res/res/values-cs/donottranslate-cldr.xml b/core/res/res/values-cs/donottranslate-cldr.xml
index 59b82d33be841..c6df7af2bcd85 100644
--- a/core/res/res/values-cs/donottranslate-cldr.xml
+++ b/core/res/res/values-cs/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">dop.</string>
-    <string name="pm">odp.</string>
     <string name="yesterday">Včera</string>
     <string name="today">Dnes</string>
     <string name="tomorrow">Zítra</string>
diff --git a/core/res/res/values-da/donottranslate-cldr.xml b/core/res/res/values-da/donottranslate-cldr.xml
index 1dfc96cff71bc..332444934884f 100644
--- a/core/res/res/values-da/donottranslate-cldr.xml
+++ b/core/res/res/values-da/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">L</string>
 
-    <string name="am">f.m.</string>
-    <string name="pm">e.m.</string>
     <string name="yesterday">i går</string>
     <string name="today">i dag</string>
     <string name="tomorrow">i morgen</string>
diff --git a/core/res/res/values-de/donottranslate-cldr.xml b/core/res/res/values-de/donottranslate-cldr.xml
index 8b834db65b2ed..eaf4dc58ed9e6 100644
--- a/core/res/res/values-de/donottranslate-cldr.xml
+++ b/core/res/res/values-de/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">vorm.</string>
-    <string name="pm">nachm.</string>
     <string name="yesterday">Gestern</string>
     <string name="today">Heute</string>
     <string name="tomorrow">Morgen</string>
diff --git a/core/res/res/values-el/donottranslate-cldr.xml b/core/res/res/values-el/donottranslate-cldr.xml
index 1e7caa4154c28..d432a532a694b 100644
--- a/core/res/res/values-el/donottranslate-cldr.xml
+++ b/core/res/res/values-el/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">Π</string>
     <string name="day_of_week_shortest_saturday">Σ</string>
 
-    <string name="am">π.μ.</string>
-    <string name="pm">μ.μ.</string>
     <string name="yesterday">Χτες</string>
     <string name="today">Σήμερα</string>
     <string name="tomorrow">Αύριο</string>
diff --git a/core/res/res/values-en-rAU/donottranslate-cldr.xml b/core/res/res/values-en-rAU/donottranslate-cldr.xml
index 557833ec496f8..59e27182be1ca 100644
--- a/core/res/res/values-en-rAU/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rAU/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">am</string>
-    <string name="pm">pm</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-en-rCA/donottranslate-cldr.xml b/core/res/res/values-en-rCA/donottranslate-cldr.xml
index 2aa7cbe580220..2821d23bc0bf7 100644
--- a/core/res/res/values-en-rCA/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rCA/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">am</string>
-    <string name="pm">pm</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-en-rGB/donottranslate-cldr.xml b/core/res/res/values-en-rGB/donottranslate-cldr.xml
index cce895ed8cd1d..d617b854c1d1f 100644
--- a/core/res/res/values-en-rGB/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rGB/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">am</string>
-    <string name="pm">pm</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-en-rIE/donottranslate-cldr.xml b/core/res/res/values-en-rIE/donottranslate-cldr.xml
index 46b13ec9470b1..e0b64db702892 100644
--- a/core/res/res/values-en-rIE/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rIE/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">a.m.</string>
-    <string name="pm">p.m.</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-en-rIN/donottranslate-cldr.xml b/core/res/res/values-en-rIN/donottranslate-cldr.xml
index 177bd7ed0f9bd..0f13a2347fad4 100644
--- a/core/res/res/values-en-rIN/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rIN/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">am</string>
-    <string name="pm">pm</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-en-rNZ/donottranslate-cldr.xml b/core/res/res/values-en-rNZ/donottranslate-cldr.xml
index 41a00a5cd73d2..999007602e836 100644
--- a/core/res/res/values-en-rNZ/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rNZ/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">am</string>
-    <string name="pm">pm</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-en-rUS/donottranslate-cldr.xml b/core/res/res/values-en-rUS/donottranslate-cldr.xml
index 15fcd8be989ca..5831807a9b432 100644
--- a/core/res/res/values-en-rUS/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rUS/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">am</string>
-    <string name="pm">pm</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-en-rZA/donottranslate-cldr.xml b/core/res/res/values-en-rZA/donottranslate-cldr.xml
index 7a5bdbd2a812d..52b7b326dde2f 100644
--- a/core/res/res/values-en-rZA/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rZA/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">am</string>
-    <string name="pm">pm</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-es-rUS/donottranslate-cldr.xml b/core/res/res/values-es-rUS/donottranslate-cldr.xml
index e2c3254d90a2b..d1d2e8afc7202 100644
--- a/core/res/res/values-es-rUS/donottranslate-cldr.xml
+++ b/core/res/res/values-es-rUS/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">V</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">a. m.</string>
-    <string name="pm">p. m.</string>
     <string name="yesterday">ayer</string>
     <string name="today">hoy</string>
     <string name="tomorrow">mañana</string>
diff --git a/core/res/res/values-es/donottranslate-cldr.xml b/core/res/res/values-es/donottranslate-cldr.xml
index faf171ab34900..83e579dbc5848 100644
--- a/core/res/res/values-es/donottranslate-cldr.xml
+++ b/core/res/res/values-es/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">V</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">a.m.</string>
-    <string name="pm">p.m.</string>
     <string name="yesterday">ayer</string>
     <string name="today">hoy</string>
     <string name="tomorrow">mañana</string>
diff --git a/core/res/res/values-et/donottranslate-cldr.xml b/core/res/res/values-et/donottranslate-cldr.xml
index d50d0415d8e50..05e8bea2abedd 100644
--- a/core/res/res/values-et/donottranslate-cldr.xml
+++ b/core/res/res/values-et/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-fa/donottranslate-cldr.xml b/core/res/res/values-fa/donottranslate-cldr.xml
index 11473fe98c7e9..d41cb08b92bbc 100644
--- a/core/res/res/values-fa/donottranslate-cldr.xml
+++ b/core/res/res/values-fa/donottranslate-cldr.xml
@@ -71,8 +71,6 @@
     <string name="day_of_week_shortest_friday">ج</string>
     <string name="day_of_week_shortest_saturday">ش</string>
 
-    <string name="am">قبل از ظهر</string>
-    <string name="pm">بعد از ظهر</string>
     <string name="yesterday">دیروز</string>
     <string name="today">امروز</string>
     <string name="tomorrow">فردا</string>
diff --git a/core/res/res/values-fi-rFI/donottranslate-cldr.xml b/core/res/res/values-fi-rFI/donottranslate-cldr.xml
index e9e1a25d227fe..7246a6bb70cea 100644
--- a/core/res/res/values-fi-rFI/donottranslate-cldr.xml
+++ b/core/res/res/values-fi-rFI/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">L</string>
 
-    <string name="am">ap.</string>
-    <string name="pm">ip.</string>
     <string name="yesterday">eilen</string>
     <string name="today">tänään</string>
     <string name="tomorrow">huomenna</string>
diff --git a/core/res/res/values-fi/donottranslate-cldr.xml b/core/res/res/values-fi/donottranslate-cldr.xml
index 71cccf39b7321..4c7229902a608 100644
--- a/core/res/res/values-fi/donottranslate-cldr.xml
+++ b/core/res/res/values-fi/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">L</string>
 
-    <string name="am">ap.</string>
-    <string name="pm">ip.</string>
     <string name="yesterday">eilen</string>
     <string name="today">tänään</string>
     <string name="tomorrow">huomenna</string>
diff --git a/core/res/res/values-fr/donottranslate-cldr.xml b/core/res/res/values-fr/donottranslate-cldr.xml
index 840f728aff818..a70da74c3f5bb 100644
--- a/core/res/res/values-fr/donottranslate-cldr.xml
+++ b/core/res/res/values-fr/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">V</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">matin</string>
-    <string name="pm">soir</string>
     <string name="yesterday">hier</string>
     <string name="today">aujourd’hui</string>
     <string name="tomorrow">demain</string>
diff --git a/core/res/res/values-hi-rIN/donottranslate-cldr.xml b/core/res/res/values-hi-rIN/donottranslate-cldr.xml
index 6bfd3de2d704a..c6c0e662a73f9 100644
--- a/core/res/res/values-hi-rIN/donottranslate-cldr.xml
+++ b/core/res/res/values-hi-rIN/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">शु</string>
     <string name="day_of_week_shortest_saturday">श</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-hi/donottranslate-cldr.xml b/core/res/res/values-hi/donottranslate-cldr.xml
index d9405d83aa117..5b69137e163b3 100644
--- a/core/res/res/values-hi/donottranslate-cldr.xml
+++ b/core/res/res/values-hi/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">शु</string>
     <string name="day_of_week_shortest_saturday">श</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-hr-rHR/donottranslate-cldr.xml b/core/res/res/values-hr-rHR/donottranslate-cldr.xml
index a601d938f69c5..023904ce35073 100644
--- a/core/res/res/values-hr-rHR/donottranslate-cldr.xml
+++ b/core/res/res/values-hr-rHR/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">p</string>
     <string name="day_of_week_shortest_saturday">s</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">jučer</string>
     <string name="today">danas</string>
     <string name="tomorrow">sutra</string>
diff --git a/core/res/res/values-hr/donottranslate-cldr.xml b/core/res/res/values-hr/donottranslate-cldr.xml
index 9b51862845700..35b7ca82cc08c 100644
--- a/core/res/res/values-hr/donottranslate-cldr.xml
+++ b/core/res/res/values-hr/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">p</string>
     <string name="day_of_week_shortest_saturday">s</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">jučer</string>
     <string name="today">danas</string>
     <string name="tomorrow">sutra</string>
diff --git a/core/res/res/values-hu-rHU/donottranslate-cldr.xml b/core/res/res/values-hu-rHU/donottranslate-cldr.xml
index afb767625d934..ff5b3c2b26cda 100644
--- a/core/res/res/values-hu-rHU/donottranslate-cldr.xml
+++ b/core/res/res/values-hu-rHU/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">de.</string>
-    <string name="pm">du.</string>
     <string name="yesterday">tegnap</string>
     <string name="today">ma</string>
     <string name="tomorrow">holnap</string>
diff --git a/core/res/res/values-hu/donottranslate-cldr.xml b/core/res/res/values-hu/donottranslate-cldr.xml
index 28b65bcf4dd18..563209225f29d 100644
--- a/core/res/res/values-hu/donottranslate-cldr.xml
+++ b/core/res/res/values-hu/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">de.</string>
-    <string name="pm">du.</string>
     <string name="yesterday">tegnap</string>
     <string name="today">ma</string>
     <string name="tomorrow">holnap</string>
diff --git a/core/res/res/values-in-rID/donottranslate-cldr.xml b/core/res/res/values-in-rID/donottranslate-cldr.xml
index b79fe00bdcb35..34a67a82e7ade 100644
--- a/core/res/res/values-in-rID/donottranslate-cldr.xml
+++ b/core/res/res/values-in-rID/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-in/donottranslate-cldr.xml b/core/res/res/values-in/donottranslate-cldr.xml
index 9a634cc72e645..0fb7f222c5f71 100644
--- a/core/res/res/values-in/donottranslate-cldr.xml
+++ b/core/res/res/values-in/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-it/donottranslate-cldr.xml b/core/res/res/values-it/donottranslate-cldr.xml
index 8cee828f2fafb..de15285cf8a8a 100644
--- a/core/res/res/values-it/donottranslate-cldr.xml
+++ b/core/res/res/values-it/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">V</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">m.</string>
-    <string name="pm">p.</string>
     <string name="yesterday">ieri</string>
     <string name="today">oggi</string>
     <string name="tomorrow">domani</string>
diff --git a/core/res/res/values-iw/donottranslate-cldr.xml b/core/res/res/values-iw/donottranslate-cldr.xml
index 02d1e9c2382e3..229f3eac0aae8 100644
--- a/core/res/res/values-iw/donottranslate-cldr.xml
+++ b/core/res/res/values-iw/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">ו</string>
     <string name="day_of_week_shortest_saturday">ש</string>
 
-    <string name="am">לפנה"צ</string>
-    <string name="pm">אחה"צ</string>
     <string name="yesterday">אתמול</string>
     <string name="today">היום</string>
     <string name="tomorrow">מחר</string>
diff --git a/core/res/res/values-ja/donottranslate-cldr.xml b/core/res/res/values-ja/donottranslate-cldr.xml
index 450adc3309c1c..7b3356d976105 100644
--- a/core/res/res/values-ja/donottranslate-cldr.xml
+++ b/core/res/res/values-ja/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">金</string>
     <string name="day_of_week_shortest_saturday">土</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">昨日</string>
     <string name="today">今日</string>
     <string name="tomorrow">明日</string>
diff --git a/core/res/res/values-ko/donottranslate-cldr.xml b/core/res/res/values-ko/donottranslate-cldr.xml
index 5382871c1406f..15c6a110b3022 100644
--- a/core/res/res/values-ko/donottranslate-cldr.xml
+++ b/core/res/res/values-ko/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">금</string>
     <string name="day_of_week_shortest_saturday">토</string>
 
-    <string name="am">오전</string>
-    <string name="pm">오후</string>
     <string name="yesterday">어제</string>
     <string name="today">오늘</string>
     <string name="tomorrow">내일</string>
diff --git a/core/res/res/values-lt-rLT/donottranslate-cldr.xml b/core/res/res/values-lt-rLT/donottranslate-cldr.xml
index 0c1d0aa1a2528..b5176d263dacb 100644
--- a/core/res/res/values-lt-rLT/donottranslate-cldr.xml
+++ b/core/res/res/values-lt-rLT/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">Š</string>
 
-    <string name="am">priešpiet</string>
-    <string name="pm">popiet</string>
     <string name="yesterday">vakar</string>
     <string name="today">šiandien</string>
     <string name="tomorrow">rytoj</string>
diff --git a/core/res/res/values-lt/donottranslate-cldr.xml b/core/res/res/values-lt/donottranslate-cldr.xml
index 8a2c0f4862eb4..eca5512f8840d 100644
--- a/core/res/res/values-lt/donottranslate-cldr.xml
+++ b/core/res/res/values-lt/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">Š</string>
 
-    <string name="am">priešpiet</string>
-    <string name="pm">popiet</string>
     <string name="yesterday">vakar</string>
     <string name="today">šiandien</string>
     <string name="tomorrow">rytoj</string>
diff --git a/core/res/res/values-lv-rLV/donottranslate-cldr.xml b/core/res/res/values-lv-rLV/donottranslate-cldr.xml
index 9dbc5e052be02..c40ef892ace14 100644
--- a/core/res/res/values-lv-rLV/donottranslate-cldr.xml
+++ b/core/res/res/values-lv-rLV/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">vakar</string>
     <string name="today">šodien</string>
     <string name="tomorrow">rīt</string>
diff --git a/core/res/res/values-lv/donottranslate-cldr.xml b/core/res/res/values-lv/donottranslate-cldr.xml
index 10dcd35752ab1..a31ba473be298 100644
--- a/core/res/res/values-lv/donottranslate-cldr.xml
+++ b/core/res/res/values-lv/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">vakar</string>
     <string name="today">šodien</string>
     <string name="tomorrow">rīt</string>
diff --git a/core/res/res/values-ms/donottranslate-cldr.xml b/core/res/res/values-ms/donottranslate-cldr.xml
index 09d461cc8b84f..81f08a925098a 100644
--- a/core/res/res/values-ms/donottranslate-cldr.xml
+++ b/core/res/res/values-ms/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-nb/donottranslate-cldr.xml b/core/res/res/values-nb/donottranslate-cldr.xml
index 637dd5e78602e..32951e5af2a8a 100644
--- a/core/res/res/values-nb/donottranslate-cldr.xml
+++ b/core/res/res/values-nb/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">L</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">i går</string>
     <string name="today">i dag</string>
     <string name="tomorrow">i morgen</string>
diff --git a/core/res/res/values-nl/donottranslate-cldr.xml b/core/res/res/values-nl/donottranslate-cldr.xml
index ca3813ffd91fa..51c26b4e30cbb 100644
--- a/core/res/res/values-nl/donottranslate-cldr.xml
+++ b/core/res/res/values-nl/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">V</string>
     <string name="day_of_week_shortest_saturday">Z</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Gisteren</string>
     <string name="today">Vandaag</string>
     <string name="tomorrow">Morgen</string>
diff --git a/core/res/res/values-pl/donottranslate-cldr.xml b/core/res/res/values-pl/donottranslate-cldr.xml
index 2950e60b62f6c..8ac5b449bb38f 100644
--- a/core/res/res/values-pl/donottranslate-cldr.xml
+++ b/core/res/res/values-pl/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Wczoraj</string>
     <string name="today">Dzisiaj</string>
     <string name="tomorrow">Jutro</string>
diff --git a/core/res/res/values-pt-rPT/donottranslate-cldr.xml b/core/res/res/values-pt-rPT/donottranslate-cldr.xml
index 54417a4f0749a..f1a2b32efe6eb 100644
--- a/core/res/res/values-pt-rPT/donottranslate-cldr.xml
+++ b/core/res/res/values-pt-rPT/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">S</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">Antes do meio-dia</string>
-    <string name="pm">Depois do meio-dia</string>
     <string name="yesterday">Ontem</string>
     <string name="today">Hoje</string>
     <string name="tomorrow">Amanhã</string>
diff --git a/core/res/res/values-pt/donottranslate-cldr.xml b/core/res/res/values-pt/donottranslate-cldr.xml
index d999c06db1ee9..305f4dd919e32 100644
--- a/core/res/res/values-pt/donottranslate-cldr.xml
+++ b/core/res/res/values-pt/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">S</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Ontem</string>
     <string name="today">Hoje</string>
     <string name="tomorrow">Amanhã</string>
diff --git a/core/res/res/values-ro-rRO/donottranslate-cldr.xml b/core/res/res/values-ro-rRO/donottranslate-cldr.xml
index 732ae24f88e37..d4782f9803fa7 100644
--- a/core/res/res/values-ro-rRO/donottranslate-cldr.xml
+++ b/core/res/res/values-ro-rRO/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">V</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">ieri</string>
     <string name="today">azi</string>
     <string name="tomorrow">mâine</string>
diff --git a/core/res/res/values-ro/donottranslate-cldr.xml b/core/res/res/values-ro/donottranslate-cldr.xml
index e9a70dc284593..858a26423c899 100644
--- a/core/res/res/values-ro/donottranslate-cldr.xml
+++ b/core/res/res/values-ro/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">V</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">ieri</string>
     <string name="today">azi</string>
     <string name="tomorrow">mâine</string>
diff --git a/core/res/res/values-ru/donottranslate-cldr.xml b/core/res/res/values-ru/donottranslate-cldr.xml
index 2fbcd4349e343..e4cc075dfc8ee 100644
--- a/core/res/res/values-ru/donottranslate-cldr.xml
+++ b/core/res/res/values-ru/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">П</string>
     <string name="day_of_week_shortest_saturday">С</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Вчера</string>
     <string name="today">Сегодня</string>
     <string name="tomorrow">Завтра</string>
diff --git a/core/res/res/values-sk-rSK/donottranslate-cldr.xml b/core/res/res/values-sk-rSK/donottranslate-cldr.xml
index 2843ae3334a3a..e8ed3896a8f15 100644
--- a/core/res/res/values-sk-rSK/donottranslate-cldr.xml
+++ b/core/res/res/values-sk-rSK/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">dopoludnia</string>
-    <string name="pm">popoludní</string>
     <string name="yesterday">Včera</string>
     <string name="today">Dnes</string>
     <string name="tomorrow">Zajtra</string>
diff --git a/core/res/res/values-sk/donottranslate-cldr.xml b/core/res/res/values-sk/donottranslate-cldr.xml
index dcdaad16a24f3..e0f33dc279aa3 100644
--- a/core/res/res/values-sk/donottranslate-cldr.xml
+++ b/core/res/res/values-sk/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">P</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">dopoludnia</string>
-    <string name="pm">popoludní</string>
     <string name="yesterday">Včera</string>
     <string name="today">Dnes</string>
     <string name="tomorrow">Zajtra</string>
diff --git a/core/res/res/values-sl-rSI/donottranslate-cldr.xml b/core/res/res/values-sl-rSI/donottranslate-cldr.xml
index cbabccd0f3536..08597f682c2f6 100644
--- a/core/res/res/values-sl-rSI/donottranslate-cldr.xml
+++ b/core/res/res/values-sl-rSI/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">p</string>
     <string name="day_of_week_shortest_saturday">s</string>
 
-    <string name="am">dop.</string>
-    <string name="pm">pop.</string>
     <string name="yesterday">Včeraj</string>
     <string name="today">Danes</string>
     <string name="tomorrow">Jutri</string>
diff --git a/core/res/res/values-sl/donottranslate-cldr.xml b/core/res/res/values-sl/donottranslate-cldr.xml
index b804b3fd1fbd6..8273521da0201 100644
--- a/core/res/res/values-sl/donottranslate-cldr.xml
+++ b/core/res/res/values-sl/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">p</string>
     <string name="day_of_week_shortest_saturday">s</string>
 
-    <string name="am">dop.</string>
-    <string name="pm">pop.</string>
     <string name="yesterday">Včeraj</string>
     <string name="today">Danes</string>
     <string name="tomorrow">Jutri</string>
diff --git a/core/res/res/values-sr-rRS/donottranslate-cldr.xml b/core/res/res/values-sr-rRS/donottranslate-cldr.xml
index 7168bccfabbab..ea0d8b7c7c9ba 100644
--- a/core/res/res/values-sr-rRS/donottranslate-cldr.xml
+++ b/core/res/res/values-sr-rRS/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">п</string>
     <string name="day_of_week_shortest_saturday">с</string>
 
-    <string name="am">пре подне</string>
-    <string name="pm">поподне</string>
     <string name="yesterday">јуче</string>
     <string name="today">данас</string>
     <string name="tomorrow">сутра</string>
diff --git a/core/res/res/values-sr/donottranslate-cldr.xml b/core/res/res/values-sr/donottranslate-cldr.xml
index 7426bdcf1e56d..41461764b1dbf 100644
--- a/core/res/res/values-sr/donottranslate-cldr.xml
+++ b/core/res/res/values-sr/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">п</string>
     <string name="day_of_week_shortest_saturday">с</string>
 
-    <string name="am">пре подне</string>
-    <string name="pm">поподне</string>
     <string name="yesterday">јуче</string>
     <string name="today">данас</string>
     <string name="tomorrow">сутра</string>
diff --git a/core/res/res/values-sv/donottranslate-cldr.xml b/core/res/res/values-sv/donottranslate-cldr.xml
index 8b7833fba0224..8e5684a1d1ba2 100644
--- a/core/res/res/values-sv/donottranslate-cldr.xml
+++ b/core/res/res/values-sv/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">L</string>
 
-    <string name="am">f.m.</string>
-    <string name="pm">e.m.</string>
     <string name="yesterday">igår</string>
     <string name="today">idag</string>
     <string name="tomorrow">imorgon</string>
diff --git a/core/res/res/values-sw/donottranslate-cldr.xml b/core/res/res/values-sw/donottranslate-cldr.xml
index 2bc07c14266af..124266b8c75b6 100644
--- a/core/res/res/values-sw/donottranslate-cldr.xml
+++ b/core/res/res/values-sw/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-th-rTH/donottranslate-cldr.xml b/core/res/res/values-th-rTH/donottranslate-cldr.xml
index 7049c52916701..cddc5c377f636 100644
--- a/core/res/res/values-th-rTH/donottranslate-cldr.xml
+++ b/core/res/res/values-th-rTH/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">ศ</string>
     <string name="day_of_week_shortest_saturday">ส</string>
 
-    <string name="am">ก่อนเที่ยง</string>
-    <string name="pm">หลังเที่ยง</string>
     <string name="yesterday">เมื่อวาน</string>
     <string name="today">วันนี้</string>
     <string name="tomorrow">พรุ่งนี้</string>
diff --git a/core/res/res/values-th/donottranslate-cldr.xml b/core/res/res/values-th/donottranslate-cldr.xml
index f3196d1277dad..bf0d093327614 100644
--- a/core/res/res/values-th/donottranslate-cldr.xml
+++ b/core/res/res/values-th/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">ศ</string>
     <string name="day_of_week_shortest_saturday">ส</string>
 
-    <string name="am">ก่อนเที่ยง</string>
-    <string name="pm">หลังเที่ยง</string>
     <string name="yesterday">เมื่อวาน</string>
     <string name="today">วันนี้</string>
     <string name="tomorrow">พรุ่งนี้</string>
diff --git a/core/res/res/values-tl/donottranslate-cldr.xml b/core/res/res/values-tl/donottranslate-cldr.xml
index 6ff92e3d9e9fc..7e8c5357a5c5e 100644
--- a/core/res/res/values-tl/donottranslate-cldr.xml
+++ b/core/res/res/values-tl/donottranslate-cldr.xml
@@ -59,8 +59,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-tr/donottranslate-cldr.xml b/core/res/res/values-tr/donottranslate-cldr.xml
index 92b0c72753f50..09db85343712a 100644
--- a/core/res/res/values-tr/donottranslate-cldr.xml
+++ b/core/res/res/values-tr/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">C</string>
     <string name="day_of_week_shortest_saturday">C</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Dün</string>
     <string name="today">Bugün</string>
     <string name="tomorrow">Yarın</string>
diff --git a/core/res/res/values-uk-rUA/donottranslate-cldr.xml b/core/res/res/values-uk-rUA/donottranslate-cldr.xml
index caf46a389bc8b..18afd2d996d5a 100644
--- a/core/res/res/values-uk-rUA/donottranslate-cldr.xml
+++ b/core/res/res/values-uk-rUA/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">П</string>
     <string name="day_of_week_shortest_saturday">С</string>
 
-    <string name="am">дп</string>
-    <string name="pm">пп</string>
     <string name="yesterday">Вчора</string>
     <string name="today">Сьогодні</string>
     <string name="tomorrow">Завтра</string>
diff --git a/core/res/res/values-uk/donottranslate-cldr.xml b/core/res/res/values-uk/donottranslate-cldr.xml
index 46211ac2ea957..3b78a25ae7106 100644
--- a/core/res/res/values-uk/donottranslate-cldr.xml
+++ b/core/res/res/values-uk/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">П</string>
     <string name="day_of_week_shortest_saturday">С</string>
 
-    <string name="am">дп</string>
-    <string name="pm">пп</string>
     <string name="yesterday">Вчора</string>
     <string name="today">Сьогодні</string>
     <string name="tomorrow">Завтра</string>
diff --git a/core/res/res/values-vi-rVN/donottranslate-cldr.xml b/core/res/res/values-vi-rVN/donottranslate-cldr.xml
index 5d049a1b72fd7..f38574007a87e 100644
--- a/core/res/res/values-vi-rVN/donottranslate-cldr.xml
+++ b/core/res/res/values-vi-rVN/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">SA</string>
-    <string name="pm">CH</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-vi/donottranslate-cldr.xml b/core/res/res/values-vi/donottranslate-cldr.xml
index 9a757cd5d4dc8..4c2d5d677304c 100644
--- a/core/res/res/values-vi/donottranslate-cldr.xml
+++ b/core/res/res/values-vi/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">SA</string>
-    <string name="pm">CH</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values-zh-rCN/donottranslate-cldr.xml b/core/res/res/values-zh-rCN/donottranslate-cldr.xml
index 9e6ef1c3fb390..7647cc72a46be 100644
--- a/core/res/res/values-zh-rCN/donottranslate-cldr.xml
+++ b/core/res/res/values-zh-rCN/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">五</string>
     <string name="day_of_week_shortest_saturday">六</string>
 
-    <string name="am">上午</string>
-    <string name="pm">下午</string>
     <string name="yesterday">昨天</string>
     <string name="today">今天</string>
     <string name="tomorrow">明天</string>
diff --git a/core/res/res/values-zh-rTW/donottranslate-cldr.xml b/core/res/res/values-zh-rTW/donottranslate-cldr.xml
index 907d82e03a452..b960aac422d76 100644
--- a/core/res/res/values-zh-rTW/donottranslate-cldr.xml
+++ b/core/res/res/values-zh-rTW/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">五</string>
     <string name="day_of_week_shortest_saturday">六</string>
 
-    <string name="am">上午</string>
-    <string name="pm">下午</string>
     <string name="yesterday">昨天</string>
     <string name="today">今天</string>
     <string name="tomorrow">明天</string>
diff --git a/core/res/res/values-zu/donottranslate-cldr.xml b/core/res/res/values-zu/donottranslate-cldr.xml
index df578edb8f0d6..62653a36901af 100644
--- a/core/res/res/values-zu/donottranslate-cldr.xml
+++ b/core/res/res/values-zu/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">H</string>
     <string name="day_of_week_shortest_saturday">M</string>
 
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values/donottranslate-cldr.xml b/core/res/res/values/donottranslate-cldr.xml
index 15fcd8be989ca..5831807a9b432 100644
--- a/core/res/res/values/donottranslate-cldr.xml
+++ b/core/res/res/values/donottranslate-cldr.xml
@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">F</string>
     <string name="day_of_week_shortest_saturday">S</string>
 
-    <string name="am">am</string>
-    <string name="pm">pm</string>
     <string name="yesterday">Yesterday</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index b9b8a1b64b780..86c7817210df3 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -354,7 +354,6 @@
   <java-symbol type="string" name="activitychooserview_choose_application" />
   <java-symbol type="string" name="alternate_eri_file" />
   <java-symbol type="string" name="alwaysUse" />
-  <java-symbol type="string" name="am" />
   <java-symbol type="string" name="autofill_address_line_1_label_re" />
   <java-symbol type="string" name="autofill_address_line_1_re" />
   <java-symbol type="string" name="autofill_address_line_2_re" />
@@ -693,7 +692,6 @@
   <java-symbol type="string" name="phoneTypeWork" />
   <java-symbol type="string" name="phoneTypeWorkMobile" />
   <java-symbol type="string" name="phoneTypeWorkPager" />
-  <java-symbol type="string" name="pm" />
   <java-symbol type="string" name="policydesc_disableCamera" />
   <java-symbol type="string" name="policydesc_encryptedStorage" />
   <java-symbol type="string" name="policydesc_expirePassword" />