summaryrefslogtreecommitdiffstats
path: root/luni/src/main/java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-05-13 11:32:28 +0100
committerNarayan Kamath <narayan@google.com>2015-05-13 11:39:22 +0100
commit87f8f39e2fc964638abc5b87ba12487cfbfa0ccb (patch)
treea738c9ddeb9e48699493e4e0f50e8e8b1c0f979d /luni/src/main/java
parentf2ffbf919d8daf8a2767449969393e6309b5d2a3 (diff)
downloadlibcore-87f8f39e2fc964638abc5b87ba12487cfbfa0ccb.zip
libcore-87f8f39e2fc964638abc5b87ba12487cfbfa0ccb.tar.gz
libcore-87f8f39e2fc964638abc5b87ba12487cfbfa0ccb.tar.bz2
Update ICU / CLDR / Unicode versions for the preview.
We don't have a release number or a codename yet, but this information is still useful. bug: 19890045 Change-Id: I272e9b9cdfa103f469cb84f1bb4648b39a4510d0
Diffstat (limited to 'luni/src/main/java')
-rw-r--r--luni/src/main/java/java/util/Locale.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/luni/src/main/java/java/util/Locale.java b/luni/src/main/java/java/util/Locale.java
index 7226e1c..875955d 100644
--- a/luni/src/main/java/java/util/Locale.java
+++ b/luni/src/main/java/java/util/Locale.java
@@ -99,6 +99,10 @@ import libcore.icu.ICU;
* <td><a href="http://site.icu-project.org/download/53">ICU 53</a></td>
* <td><a href="http://cldr.unicode.org/index/downloads/cldr-25">CLDR 25</a></td>
* <td><a href="http://www.unicode.org/versions/Unicode6.3.0/">Unicode 6.3</a></td></tr>
+ * <tr><td>Android "M"</td>
+ * <td><a href="http://site.icu-project.org/download/55">ICU 55.1</a></td>
+ * <td><a href="http://cldr.unicode.org/index/downloads/cldr-27">CLDR 27.0.1</a></td>
+ * <td><a href="http://www.unicode.org/versions/Unicode7.0.0/">Unicode 7.0</a></td></tr>
* </table>
*
* <a name="default_locale"></a><h3>Be wary of the default locale</h3>