commit f6178e565d9c6a9962fc34712ca6de85e16fd2ed
author The Android Automerger <android-build@google.com> Tue Oct 21 17:45:21 2014 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 21 17:45:21 2014 -0700
tree 1bc9b34661186ab336a749243529be4033dfdbcf
parent 76e916456153c0fed205c9d706fba7f2dedccc8f
parent 04c0a6edda9e91431e19d2d878a8c8ab6cff0f1d

merge in lmp-release history after reset to 76e916456153c0fed205c9d706fba7f2dedccc8f

luni/src/main/java/java/util/Locale.java

diff --git a/luni/src/main/java/java/util/Locale.java b/luni/src/main/java/java/util/Locale.java
index 09fb6e0..d49358d 100644
--- a/luni/src/main/java/java/util/Locale.java
+++ b/luni/src/main/java/java/util/Locale.java
@@ -95,7 +95,7 @@
  *     <td><a href="http://site.icu-project.org/download/51">ICU 51</a></td>
  *     <td><a href="http://cldr.unicode.org/index/downloads/cldr-23">CLDR 23</a></td>
  *     <td><a href="http://www.unicode.org/versions/Unicode6.2.0/">Unicode 6.2</a></td></tr>
- * <tr><td>Android 4.? (STOPSHIP)</td>
+ * <tr><td>Android 5.0 (Lollipop)</td>
  *     <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>