commit 041bb9513290af8d08f5bd2c7eef00dd7ad87342
author Tobias Thierer <tobiast@google.com> Mon Oct 03 14:05:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 03 14:05:33 2016 +0000
tree f88c1731a11faba1f68610aeb3a7dc561ac41b62
parent e60842aba30adee4cf2057a39ac9a396790e938f
parent 19e46f91faaaa8df007c9304ac2206e4df1e7c7e

Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f am: abc432fd09
am: 19e46f91fa

Change-Id: I55ae235e9f1aa0e1442549408206fb9dcc0b6d91

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index fcf9dc23..d5b0426 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -59306,8 +59306,10 @@
     method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
     method public java.lang.String getUnicodeLocaleType(java.lang.String);
     method public java.lang.String getVariant();
+    method public boolean hasExtensions();
     method public static synchronized void setDefault(java.util.Locale);
     method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
+    method public java.util.Locale stripExtensions();
     method public java.lang.String toLanguageTag();
     method public final java.lang.String toString();
     field public static final java.util.Locale CANADA;

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 51b4801..db5273b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -62840,8 +62840,10 @@
     method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
     method public java.lang.String getUnicodeLocaleType(java.lang.String);
     method public java.lang.String getVariant();
+    method public boolean hasExtensions();
     method public static synchronized void setDefault(java.util.Locale);
     method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
+    method public java.util.Locale stripExtensions();
     method public java.lang.String toLanguageTag();
     method public final java.lang.String toString();
     field public static final java.util.Locale CANADA;

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index b1f30b2..9b51a1c 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -59397,8 +59397,10 @@
     method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
     method public java.lang.String getUnicodeLocaleType(java.lang.String);
     method public java.lang.String getVariant();
+    method public boolean hasExtensions();
     method public static synchronized void setDefault(java.util.Locale);
     method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
+    method public java.util.Locale stripExtensions();
     method public java.lang.String toLanguageTag();
     method public final java.lang.String toString();
     field public static final java.util.Locale CANADA;