diff options
| author | Elliott Hughes <enh@google.com> | 2012-07-25 17:30:24 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-09-14 17:10:00 -0700 |
| commit | 4af85345e798c37ab026e93a1ae250d8bca4fc40 (patch) | |
| tree | 0d065d1cd93dacb5b2bbe5addc6ac1144d042f60 /core/res/res/values-vi-rVN | |
| parent | 1c9894aa7f0eaa9ab562c1c384317456fd99dd6c (diff) | |
| download | frameworks_base-4af85345e798c37ab026e93a1ae250d8bca4fc40.zip frameworks_base-4af85345e798c37ab026e93a1ae250d8bca4fc40.tar.gz frameworks_base-4af85345e798c37ab026e93a1ae250d8bca4fc40.tar.bz2 | |
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
(cherry-pick of b12b61a88a029730b1f2b006ff914c9c719f3942.)
Conflicts:
core/res/res/values/public.xml
Change-Id: Ic1a811621a0ec338abd77458ac2046577f87c1e4
Diffstat (limited to 'core/res/res/values-vi-rVN')
| -rw-r--r-- | core/res/res/values-vi-rVN/donottranslate-cldr.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/res/res/values-vi-rVN/donottranslate-cldr.xml b/core/res/res/values-vi-rVN/donottranslate-cldr.xml index 5d049a1..f385740 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> |