Snap for 11812660 from 7128cab7b1a3a090ace70ce9752a772cd527b8cf to sdk-releasesdk-release

Change-Id: I8c09e7790a63464f10c43f1727596f3137c738c7

2 files changed, 10 insertions, 28 deletions

diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml
index 14475cdc..0a60322d 100644
--- a/common/supplemental/likelySubtags.xml
+++ b/common/supplemental/likelySubtags.xml
@@ -614,9 +614,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Lojban; ?; ? } => { Lojban; Latin; world }-->
 		<likelySubtag from="jgo" to="jgo_Latn_CM"/>
 		<!--{ Ngomba; ?; ? } => { Ngomba; Latin; Cameroon }-->
-		<!-- Android patch (b/17938245) begin.
 		<likelySubtag from="ji" to="ji_Hebr_UA"/>
-		     Android patch (b/17938245) end. -->
 		<!--{ Yiddish; ?; ? } => { Yiddish; Hebrew; Ukraine }-->
 		<likelySubtag from="jmc" to="jmc_Latn_TZ"/>
 		<!--{ Machame; ?; ? } => { Machame; Latin; Tanzania }-->
@@ -752,10 +750,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Kurdish; ?; ? } => { Kurdish; Latin; Türkiye }-->
 		<likelySubtag from="ku_LB" to="ku_Arab_LB"/>
 		<!--{ Kurdish; ?; Lebanon } => { Kurdish; Arabic; Lebanon }-->
-		<!-- Android patch (CLDR ticket #3459) begin. -->
-                <likelySubtag from="ku_IR" to="ku_Arab_IR"/>
-                <!--{ Kurdish; ?; Iran } => { Kurdish; Arabic; Iran }-->
-		<!-- Android patch (CLDR ticket #3459) end. -->
 		<likelySubtag from="ku_Arab" to="ku_Arab_IQ"/>
 		<!--{ Kurdish; Arabic; ? } => { Kurdish; Arabic; Iraq }-->
 		<likelySubtag from="ku_Yezi" to="ku_Yezi_GE"/>
@@ -1256,10 +1250,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Old Irish; ?; ? } => { Old Irish; Ogham; Ireland }-->
 		<likelySubtag from="sgs" to="sgs_Latn_LT"/>
 		<!--{ Samogitian; ?; ? } => { Samogitian; Latin; Lithuania }-->
-		<!-- Android patch begin. -->
-		<likelySubtag from="sh" to="sr_Latn_RS"/>
-		<!--{ Serbo-Croatian; ?; ? } => { Serbian; Latin; Serbia }-->
-		<!-- Android patch end. -->
 		<likelySubtag from="shi" to="shi_Tfng_MA"/>
 		<!--{ Tachelhit; ?; ? } => { Tachelhit; Tifinagh; Morocco }-->
 		<likelySubtag from="shn" to="shn_Mymr_MM"/>
@@ -1834,9 +1824,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Latn_NE" to="ha_Latn_NE"/>
 		<likelySubtag from="und_Latn_NI" to="es_Latn_NI"/>
 		<likelySubtag from="und_Latn_NL" to="nl_Latn_NL"/>
-		<!-- Android patch (CLDR ticket #2698) begin. -->
-		<likelySubtag from="und_Latn_NO" to="no_Latn_NO"/>
-		<!-- Android patch (CLDR ticket #2698) end. -->
+		<likelySubtag from="und_Latn_NO" to="nb_Latn_NO"/>
 		<likelySubtag from="und_Latn_PA" to="es_Latn_PA"/>
 		<likelySubtag from="und_Latn_PE" to="es_Latn_PE"/>
 		<likelySubtag from="und_Latn_PF" to="fr_Latn_PF"/>
@@ -1854,9 +1842,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Latn_SC" to="fr_Latn_SC"/>
 		<likelySubtag from="und_Latn_SE" to="sv_Latn_SE"/>
 		<likelySubtag from="und_Latn_SI" to="sl_Latn_SI"/>
-		<!-- Android patch (CLDR ticket #2698) begin. -->
-		<likelySubtag from="und_Latn_SJ" to="no_Latn_SJ"/>
-		<!-- Android patch (CLDR ticket #2698) end. -->
+		<likelySubtag from="und_Latn_SJ" to="nb_Latn_SJ"/>
 		<likelySubtag from="und_Latn_SK" to="sk_Latn_SK"/>
 		<likelySubtag from="und_Latn_SL" to="kri_Latn_SL"/>
 		<likelySubtag from="und_Latn_SM" to="it_Latn_SM"/>
@@ -2149,10 +2135,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; ?; Nicaragua } => { Spanish; Latin; Nicaragua }-->
 		<likelySubtag from="und_NL" to="nl_Latn_NL"/>
 		<!--{ ?; ?; Netherlands } => { Dutch; Latin; Netherlands }-->
-		<!-- Android patch (CLDR ticket #2698) begin. -->
-		<likelySubtag from="und_NO" to="no_Latn_NO"/>
-		<!--{ ?; ?; Norway } => { Norwegian; Latin; Norway }-->
-		<!-- Android patch (CLDR ticket #2698) end. -->
+		<likelySubtag from="und_NO" to="nb_Latn_NO"/>
+		<!--{ ?; ?; Norway } => { Norwegian Bokmål; Latin; Norway }-->
 		<likelySubtag from="und_NP" to="ne_Deva_NP"/>
 		<!--{ ?; ?; Nepal } => { Nepali; Devanagari; Nepal }-->
 		<likelySubtag from="und_OM" to="ar_Arab_OM"/>
@@ -2205,10 +2189,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; ?; Sweden } => { Swedish; Latin; Sweden }-->
 		<likelySubtag from="und_SI" to="sl_Latn_SI"/>
 		<!--{ ?; ?; Slovenia } => { Slovenian; Latin; Slovenia }-->
-		<!-- Android patch begin. -->
-		<likelySubtag from="und_SJ" to="no_Latn_SJ"/>
-		<!--{ ?; ?; Svalbard & Jan Mayen } => { Norwegian; Latin; Svalbard & Jan Mayen }-->
-		<!-- Android patch end. -->
+		<likelySubtag from="und_SJ" to="nb_Latn_SJ"/>
+		<!--{ ?; ?; Svalbard & Jan Mayen } => { Norwegian Bokmål; Latin; Svalbard & Jan Mayen }-->
 		<likelySubtag from="und_SK" to="sk_Latn_SK"/>
 		<!--{ ?; ?; Slovakia } => { Slovak; Latin; Slovakia }-->
 		<likelySubtag from="und_SM" to="it_Latn_SM"/>
diff --git a/common/testData/localeIdentifiers/likelySubtags.txt b/common/testData/localeIdentifiers/likelySubtags.txt
index 25a0f146..b78342d3 100644
--- a/common/testData/localeIdentifiers/likelySubtags.txt
+++ b/common/testData/localeIdentifiers/likelySubtags.txt
@@ -1397,7 +1397,7 @@ und-Latn-NF ;	en-Latn-NF ;	en-NF ;
 und-Latn-NG ;	en-Latn-NG ;	en-NG ;	
 und-Latn-NI ;	es-Latn-NI ;	es-NI ;	
 und-Latn-NL ;	nl-Latn-NL ;	nl ;	
-und-Latn-NO ;	no-Latn-NO ;	no ;	
+und-Latn-NO ;	nb-Latn-NO ;	nb ;	
 und-Latn-NR ;	en-Latn-NR ;	en-NR ;	
 und-Latn-NU ;	en-Latn-NU ;	en-NU ;	
 und-Latn-NZ ;	en-Latn-NZ ;	en-NZ ;	
@@ -1425,7 +1425,7 @@ und-Latn-SE ;	sv-Latn-SE ;	sv ;
 und-Latn-SG ;	en-Latn-SG ;	en-SG ;	
 und-Latn-SH ;	en-Latn-SH ;	en-SH ;	
 und-Latn-SI ;	sl-Latn-SI ;	sl ;	
-und-Latn-SJ ;	no-Latn-SJ ;	no-SJ ;	
+und-Latn-SJ ;	nb-Latn-SJ ;	nb-SJ ;	
 und-Latn-SK ;	sk-Latn-SK ;	sk ;	
 und-Latn-SL ;	kri-Latn-SL ;	kri ;	
 und-Latn-SM ;	it-Latn-SM ;	it-SM ;	
@@ -1505,7 +1505,7 @@ und-NF ;	en-Latn-NF ;	en-NF ;
 und-NG ;	en-Latn-NG ;	en-NG ;	
 und-NI ;	es-Latn-NI ;	es-NI ;	
 und-NL ;	nl-Latn-NL ;	nl ;	
-und-NO ;	no-Latn-NO ;	no ;	
+und-NO ;	nb-Latn-NO ;	nb ;	
 und-NP ;	ne-Deva-NP ;	ne ;	
 und-NR ;	en-Latn-NR ;	en-NR ;	
 und-NU ;	en-Latn-NU ;	en-NU ;	
@@ -1548,7 +1548,7 @@ und-SE ;	sv-Latn-SE ;	sv ;
 und-SG ;	en-Latn-SG ;	en-SG ;	
 und-SH ;	en-Latn-SH ;	en-SH ;	
 und-SI ;	sl-Latn-SI ;	sl ;	
-und-SJ ;	no-Latn-SJ ;	no-SJ ;	
+und-SJ ;	nb-Latn-SJ ;	nb-SJ ;	
 und-SK ;	sk-Latn-SK ;	sk ;	
 und-SL ;	kri-Latn-SL ;	kri ;	
 und-SM ;	it-Latn-SM ;	it-SM ;