Snap for 8730993 from f030be18ae6cb013928060316d91e1dd29102c99 to mainline-tzdata3-release
Change-Id: I3324ced552591a4bd63591c1d5c1939061c9cc1f
diff --git a/README.android b/README.android
index 75c9320..691c694 100644
--- a/README.android
+++ b/README.android
@@ -1,5 +1,5 @@
URL: https://github.com/googlei18n/libphonenumber
-Version: 8.12.46
+Version: 8.10.21
License: Apache 2
Description: Google Phone Number Library.
diff --git a/README.version b/README.version
index e08ddb2..5fcd142 100644
--- a/README.version
+++ b/README.version
@@ -1,3 +1,3 @@
URL: https://github.com/googlei18n/libphonenumber/
-Version: 8.12.46
+Version: 8.10.21
BugComponent: 24949
diff --git a/build.xml b/build.xml
index 1b89bf2..aae3fa9 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
</path>
<path id="test.classpath">
<pathelement location="${classes.dir}"/>
- <pathelement location="${lib.dir}/junit/junit-4.13.1.jar"/>
+ <pathelement location="${lib.dir}/junit/junit-4.8.1.jar"/>
<pathelement location="${jar.dir}/${ant.project.name}-test.jar"/>
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
diff --git a/carrier/pom.xml b/carrier/pom.xml
index 0ed9500..01f4874 100644
--- a/carrier/pom.xml
+++ b/carrier/pom.xml
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>carrier</artifactId>
- <version>1.172</version>
+ <version>1.117</version>
<packaging>jar</packaging>
<url>https://github.com/google/libphonenumber/</url>
<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
</parent>
<build>
@@ -55,12 +55,12 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>prefixmapper</artifactId>
- <version>2.182</version>
+ <version>2.127</version>
</dependency>
</dependencies>
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
index 8ffce00..2c5a277 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en
index b129432..df84f7c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en
index 778592a..005beb1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en
index fcb01ab..91103ea 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1340_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1340_en
deleted file mode 100644
index 84edc5d..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1340_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
index 3901344..1eeec31 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
index 3a4269a..5bd3804 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en
index f9651ea..bf8f998 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1659_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1659_en
deleted file mode 100644
index 0eb19c8..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1659_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1664_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1664_en
deleted file mode 100644
index af26fb5..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1664_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1670_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1670_en
deleted file mode 100644
index a18d602..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1670_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en
index 6279e1e..d74c943 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en
index 14e7a3a..abe55f5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1767_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1767_en
index 5a48a0e..72c1d90 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1767_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1767_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1784_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1784_en
index c8fd0d3..a34eb00 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1784_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1784_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
index 01460ed..60133a9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1869_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1869_en
index 9696a5e..939ddcc 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1869_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1869_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en
index fb09c66..6bbdfdd 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/211_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/211_en
index b8efb4b..cb319d8 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/211_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/211_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
index 05983c7..f5ded4b 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/213_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/213_en
index b70c0e8..ec131c7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/213_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/213_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en
index 852ade5..1246c7d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/218_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/218_en
deleted file mode 100644
index 336e9e8..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/218_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en
index dfa60c9..7dd6e80 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en
index f5314b2..a9c14e0 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/222_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/222_en
index f3f579b..37602e0 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/222_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/222_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
index 5c04fd1..c767ada 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/224_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/224_en
index 7045fc3..d6899e3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/224_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/224_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en
index 516c146..a83f0dc 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
index 88130d5..ddf5128 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en
index 035235c..144626f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en
index bf2994f..9f3a6da 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
index 491a157..67626ae 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en
index 43c651d..3f1bcb5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en
index 652ad43..3ecd9c3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
index 66bb370..f27a085 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
index 81766ae..ef04f08 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en
index 13f6609..99284df 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en
index 0e4a45c..eb8493f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
index 729f650..6619b94 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/238_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/238_en
index 6146855..c8b833e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/238_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/238_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/240_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/240_en
index b3d4983..95c961d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/240_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/240_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en
index 835ed98..cc21ce9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en
index ad8d9b8..882427c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en
index 4eab976..0ff477d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/246_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/246_en
deleted file mode 100644
index c02a438..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/246_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/247_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/247_en
deleted file mode 100644
index 4318f70..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/247_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en
index 21e6849..eb39a96 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/250_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/250_en
index a2cfbf2..970b425 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/250_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/250_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
index c3efeaa..184a994 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
index 6041271..1f45d5d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
index 9d33980..26d5efd 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en
index 61a1151..961b888 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en
index 4980e39..3a50b7c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en
index c7aa5e6..3b63efa 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
index a36efe9..38a8db0 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en
index 96a7b5b..2d04c69 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
index 1df0284..39fd4d3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en
index f08ca8a..613edda 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/266_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/266_en
deleted file mode 100644
index b28fda4..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/266_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en
index b9903a1..3a75c11 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en
index 9acfa85..6c836f2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
index 75fee28..6e122f6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/290_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/290_en
deleted file mode 100644
index 557c729..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/290_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/291_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/291_en
deleted file mode 100644
index 123f485..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/291_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
index 15cca8e..52780a7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
index e3a67da..b9653a4 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en
index bdff748..32588d7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
index 594eba3..bd7a9ca 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
index 6df3752..563cead 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
index 0438dc3..25c1c4a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
index 42dbe35..26587f1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
index 194932b..d242cf2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
index 6e73042..0db21eb 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en
index 28a1c56..b003beb 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
index 1547617..f6c24f4 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/356_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/356_en
index b9eb00c..b67d25f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/356_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/356_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
index 24f1123..22041f6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
index a589090..c659607 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/36_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/36_en
index 32ba790..7305225 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/36_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/36_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
index 32cd4aa..ba31786 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
index b07561a..e3dfb5b 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
index 21224a3..5648bb4 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en
index 0faea91..2003d64 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/377_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/377_en
deleted file mode 100644
index bc38b58..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/377_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/378_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/378_en
deleted file mode 100644
index 437de7f..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/378_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
index e536083..a1d0dbd 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en
index 9bcdc60..79ec6c5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
index 3e9b2db..228363a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
index c0b89de..b245c62 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
index c430180..77a0a92 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en
index be11c92..3a76eb4 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
index ba3c08a..1bc4394 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
index 058355f..6d77802 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
index a17f7d8..acda9c7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
index 83605f0..1a1cae9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
index c8a8de3..1687007 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en
index 617e4c0..4fbfb44 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
index 79b9f94..955ec7f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
index dbc8c52..7f4a4ec 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
deleted file mode 100644
index 719c0bc..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
index 5917b78..ae76150 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
index 66546b2..50782a2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
index 922143a..4c49f5f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/500_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/500_en
deleted file mode 100644
index 107bcf5..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/500_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en
deleted file mode 100644
index e3a6bc2..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en
index 720d22a..3a44b9a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
index 57520a3..1f612c9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/504_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/504_en
deleted file mode 100644
index 91fc19f..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/504_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en
index 7606196..e46e455 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en
index b0c2bb9..043e6a1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
index 9d4d7da..da29655 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
index a651fce..031b31f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
index 99508fb..bada8bb 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
index 81e6fa0..8705fc9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
index 67386fe..4b5a57e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
index 811c55d..ffd1595 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
index 8679ecf..46290b9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
index 721044b..eb75442 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en
index 69ac80f..0cf01c9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
index 9edf3f7..903bc1d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en
index 7983842..20ef1b8 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
index 21ccd71..456c3d7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en
index e4f813d..ea3fd50 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en
index e953b26..1301c8e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
index 28ea3fc..7279833 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
index f8608c1..4c17f45 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en
index 2bf7b98..1cb58a1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/64_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/64_en
index 0b2fda4..c72c275 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/64_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/64_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
index 9dc543a..983db36 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
index a3a918a..d45eb62 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en
index 646a59b..151186c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/672_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/672_en
deleted file mode 100644
index 2fb04dd..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/672_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
index 7f18430..921b8b1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
index 9444178..2166979 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
index 328156d..ce89621 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/676_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/676_en
deleted file mode 100644
index 9359f7c..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/676_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en
index 85f3457..3921eea 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en
index adb6437..2886107 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/681_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/681_en
deleted file mode 100644
index 48e56d2..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/681_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/682_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/682_en
deleted file mode 100644
index 8b85ff2..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/682_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/683_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/683_en
deleted file mode 100644
index 35daa5a..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/683_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en
index 623161f..e95b3a4 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en
index 355e346..c461702 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/687_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/687_en
deleted file mode 100644
index 0e76c74..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/687_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/690_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/690_en
deleted file mode 100644
index 8b864ce..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/690_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/691_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/691_en
deleted file mode 100644
index ff87652..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/691_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en
deleted file mode 100644
index f0f063c..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
index 2586152..e2cdb83 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
index eca5c78..b4e8b0e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en
deleted file mode 100644
index 95424ab..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_en
deleted file mode 100644
index defe2bc..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_ko b/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_ko
deleted file mode 100644
index 3cc6217..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_ko
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en
index 080e3c4..5e49c0c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/850_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/850_en
deleted file mode 100644
index 3182b3e..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/850_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
index 6828fc6..e9a42e6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
index 7669b5b..2699f49 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
index cc483c3..3bf7b2c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
index 72797dc..81dc1f0 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
index d4b5380..85e5133 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en
index 5ac1d88..fbd3f01 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
index 1e2437c..0e56006 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
index 8e6daef..cbd3cae 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/881_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/881_en
deleted file mode 100644
index 95bb8c8..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/881_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en
deleted file mode 100644
index 0a28266..0000000
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en
+++ /dev/null
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
index db2bf0e..332bdd3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
index 9819527..17cd2a5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
index 97d3b5a..3206761 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en
index 2e37c23..a34ca1d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en
index c5b9552..b40e320 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
index db3765d..971f620 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
index 897de58..dccf09e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en
index 0166f0d..b3160c2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en
index bc48c09..6af4445 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
index 593e0c4..efccdb0 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en
index 269d702..6e77a4d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en
index a4c0af4..d5bcb56 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en
index b030471..70fea2c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en
index b6f46de..73f25d3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/970_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/970_en
index 5471ae1..264e673 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/970_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/970_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
index 862fba3..ac8faba 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
index b1663fe..0a4e1d0 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
index c34cabb..d3f9134 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
index 5e41d40..12572c5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
index 24d2902..be297ff 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
index b7635df..874ba2b 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
index 74499f5..c360caa 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en
index 337c346..078b3ff 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
index f6e3a17..0882811 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
index 9275bbe..c767ca1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
index 1a790e7..de48788 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en
index d551c65..67489f3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
index 9ba15ab..0fff334 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
Binary files differ
diff --git a/demo/build.xml b/demo/build.xml
index 5cc93a7..b9ed0cb 100644
--- a/demo/build.xml
+++ b/demo/build.xml
@@ -30,7 +30,7 @@
</fileset>
</copy>
<javac srcdir="src" destdir="war/WEB-INF/classes" classpathref="project.classpath" debug="on"
- includeAntRuntime="false" source="1.8" target="1.8"/>
+ includeAntRuntime="false"/>
</target>
<target name="runserver" depends="compile" description="Starts the development server.">
diff --git a/demo/pom.xml b/demo/pom.xml
index 775474c..9367b3b 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>demo</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
<packaging>jar</packaging>
<url>https://github.com/google/libphonenumber/</url>
<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
</parent>
<properties>
@@ -25,8 +25,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.6</source>
+ <target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -74,7 +74,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.7</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -89,17 +89,17 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>geocoder</artifactId>
- <version>2.182</version>
+ <version>2.127</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>carrier</artifactId>
- <version>1.172</version>
+ <version>1.117</version>
</dependency>
</dependencies>
diff --git a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
index 40f0fa8..9dd9105 100644
--- a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
+++ b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
@@ -28,19 +28,10 @@
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType;
-import com.google.i18n.phonenumbers.PhoneNumberUtil.ValidationResult;
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
import com.google.i18n.phonenumbers.ShortNumberInfo;
import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Locale;
-import java.util.StringTokenizer;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.fileupload.FileItemIterator;
import org.apache.commons.fileupload.FileItemStream;
import org.apache.commons.fileupload.FileUploadException;
@@ -49,6 +40,17 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
/**
* A servlet that accepts requests that contain strings representing a phone number and a default
* country, and responds with results from parsing, validating and formatting the number. The
@@ -59,11 +61,10 @@
public class PhoneNumberParserServlet extends HttpServlet {
private PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
private ShortNumberInfo shortInfo = ShortNumberInfo.getInstance();
-
public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
String phoneNumber = null;
String defaultCountry = null;
- String languageCode = "en"; // Default languageCode to English if nothing is entered.
+ String languageCode = "en"; // Default languageCode to English if nothing is entered.
String regionCode = "";
String fileContents = null;
ServletFileUpload upload = new ServletFileUpload();
@@ -105,14 +106,16 @@
if (fileContents == null || fileContents.length() == 0) {
// Redirect to a URL with the given input encoded in the query parameters.
Locale geocodingLocale = new Locale(languageCode, regionCode);
- resp.sendRedirect(
- getPermaLinkURL(phoneNumber, defaultCountry, geocodingLocale, false /* absoluteURL */));
+ resp.sendRedirect(getPermaLinkURL(phoneNumber, defaultCountry, geocodingLocale,
+ false /* absoluteURL */));
} else {
resp.getWriter().println(getOutputForFile(defaultCountry, fileContents));
}
}
- /** Handle the get request to get information about a number based on query parameters. */
+ /**
+ * Handle the get request to get information about a number based on query parameters.
+ */
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
String phoneNumber = req.getParameter("number");
if (phoneNumber == null) {
@@ -125,21 +128,20 @@
String geocodingParam = req.getParameter("geocodingLocale");
Locale geocodingLocale;
if (geocodingParam == null) {
- geocodingLocale = ENGLISH; // Default languageCode to English if nothing is entered.
+ geocodingLocale = ENGLISH; // Default languageCode to English if nothing is entered.
} else {
geocodingLocale = Locale.forLanguageTag(geocodingParam);
}
resp.setContentType("text/html");
resp.setCharacterEncoding(UTF_8.name());
- resp.getWriter()
- .println(getOutputForSingleNumber(phoneNumber, defaultCountry, geocodingLocale));
+ resp.getWriter().println(
+ getOutputForSingleNumber(phoneNumber, defaultCountry, geocodingLocale));
}
private StringBuilder getOutputForFile(String defaultCountry, String fileContents) {
- StringBuilder output =
- new StringBuilder(
- "<HTML><HEAD><TITLE>Results generated from phone numbers in the file provided:"
- + "</TITLE></HEAD><BODY>");
+ StringBuilder output = new StringBuilder(
+ "<HTML><HEAD><TITLE>Results generated from phone numbers in the file provided:"
+ + "</TITLE></HEAD><BODY>");
output.append("<TABLE align=center border=1>");
output.append("<TH align=center>ID</TH>");
output.append("<TH align=center>Raw phone number</TH>");
@@ -153,31 +155,25 @@
phoneNumberId++;
output.append("<TR>");
output.append("<TD align=center>").append(phoneNumberId).append(" </TD> \n");
- output
- .append("<TD align=center>")
- .append(StringEscapeUtils.escapeHtml(numberStr))
- .append(" </TD> \n");
+ output.append("<TD align=center>").append(
+ StringEscapeUtils.escapeHtml(numberStr)).append(" </TD> \n");
try {
PhoneNumber number = phoneUtil.parseAndKeepRawInput(numberStr, defaultCountry);
boolean isNumberValid = phoneUtil.isValidNumber(number);
- String prettyFormat =
- isNumberValid ? phoneUtil.formatInOriginalFormat(number, defaultCountry) : "invalid";
- String internationalFormat =
- isNumberValid ? phoneUtil.format(number, PhoneNumberFormat.INTERNATIONAL) : "invalid";
+ String prettyFormat = isNumberValid
+ ? phoneUtil.formatInOriginalFormat(number, defaultCountry)
+ : "invalid";
+ String internationalFormat = isNumberValid
+ ? phoneUtil.format(number, PhoneNumberFormat.INTERNATIONAL)
+ : "invalid";
- output
- .append("<TD align=center>")
- .append(StringEscapeUtils.escapeHtml(prettyFormat))
- .append(" </TD> \n");
- output
- .append("<TD align=center>")
- .append(StringEscapeUtils.escapeHtml(internationalFormat))
- .append(" </TD> \n");
+ output.append("<TD align=center>").append(
+ StringEscapeUtils.escapeHtml(prettyFormat)).append(" </TD> \n");
+ output.append("<TD align=center>").append(
+ StringEscapeUtils.escapeHtml(internationalFormat)).append(" </TD> \n");
} catch (NumberParseException e) {
- output
- .append("<TD align=center colspan=2>")
- .append(StringEscapeUtils.escapeHtml(e.toString()))
- .append(" </TD> \n");
+ output.append("<TD align=center colspan=2>").append(
+ StringEscapeUtils.escapeHtml(e.toString())).append(" </TD> \n");
}
output.append("</TR>");
}
@@ -192,27 +188,26 @@
output.append("</TR>");
}
- /** Returns a stable URL pointing to the result page for the given input. */
+ /**
+ * Returns a stable URL pointing to the result page for the given input.
+ */
private String getPermaLinkURL(
String phoneNumber, String defaultCountry, Locale geocodingLocale, boolean absoluteURL) {
// If absoluteURL is false, generate a relative path. Otherwise, produce an absolute URL.
- StringBuilder permaLink =
- new StringBuilder(
- absoluteURL
- ? "http://libphonenumber.appspot.com/phonenumberparser"
- : "/phonenumberparser");
+ StringBuilder permaLink = new StringBuilder(
+ absoluteURL ? "http://libphonenumber.appspot.com/phonenumberparser" : "/phonenumberparser");
try {
permaLink.append(
"?number=" + URLEncoder.encode(phoneNumber != null ? phoneNumber : "", UTF_8.name()));
if (defaultCountry != null && !defaultCountry.isEmpty()) {
permaLink.append("&country=" + URLEncoder.encode(defaultCountry, UTF_8.name()));
}
- if (!geocodingLocale.getLanguage().equals(ENGLISH.getLanguage())
- || !geocodingLocale.getCountry().isEmpty()) {
- permaLink.append(
- "&geocodingLocale=" + URLEncoder.encode(geocodingLocale.toLanguageTag(), UTF_8.name()));
+ if (!geocodingLocale.getLanguage().equals(ENGLISH.getLanguage()) ||
+ !geocodingLocale.getCountry().isEmpty()) {
+ permaLink.append("&geocodingLocale=" +
+ URLEncoder.encode(geocodingLocale.toLanguageTag(), UTF_8.name()));
}
- } catch (UnsupportedEncodingException e) {
+ } catch(UnsupportedEncodingException e) {
// UTF-8 is guaranteed in Java, so this should be impossible.
throw new AssertionError(e);
}
@@ -220,21 +215,21 @@
}
private static final String NEW_ISSUE_BASE_URL =
- "https://issuetracker.google.com/issues/new?component=192347&title=";
+ "https://issuetracker.google.com/issues/new?component=192347&title=";
- /** Returns a link to create a new github issue with the relevant information. */
+ /**
+ * Returns a link to create a new github issue with the relevant information.
+ */
private String getNewIssueLink(
String phoneNumber, String defaultCountry, Locale geocodingLocale) {
boolean hasDefaultCountry = !defaultCountry.isEmpty() && defaultCountry != "ZZ";
- String issueTitle =
- "Validation issue with "
- + phoneNumber
- + (hasDefaultCountry ? " (" + defaultCountry + ")" : "");
+ String issueTitle = "Validation issue with " + phoneNumber
+ + (hasDefaultCountry ? " (" + defaultCountry + ")" : "");
String newIssueLink = NEW_ISSUE_BASE_URL;
try {
newIssueLink += URLEncoder.encode(issueTitle, UTF_8.name());
- } catch (UnsupportedEncodingException e) {
+ } catch(UnsupportedEncodingException e) {
// UTF-8 is guaranteed in Java, so this should be impossible.
throw new AssertionError(e);
}
@@ -248,16 +243,15 @@
private StringBuilder getOutputForSingleNumber(
String phoneNumber, String defaultCountry, Locale geocodingLocale) {
StringBuilder output = new StringBuilder("<HTML><HEAD>");
- output.append("<LINK type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/main.css\" />");
+ output.append(
+ "<LINK type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/main.css\" />");
output.append("</HEAD>");
output.append("<BODY>");
output.append("Phone Number entered: " + StringEscapeUtils.escapeHtml(phoneNumber) + "<BR>");
- output.append(
- "defaultCountry entered: " + StringEscapeUtils.escapeHtml(defaultCountry) + "<BR>");
- output.append(
- "Language entered: "
- + StringEscapeUtils.escapeHtml(geocodingLocale.toLanguageTag())
- + "<BR>");
+ output.append("defaultCountry entered: " + StringEscapeUtils.escapeHtml(defaultCountry)
+ + "<BR>");
+ output.append("Language entered: "
+ + StringEscapeUtils.escapeHtml(geocodingLocale.toLanguageTag()) + "<BR>");
try {
PhoneNumber number = phoneUtil.parseAndKeepRawInput(phoneNumber, defaultCountry);
output.append("<DIV>");
@@ -282,33 +276,24 @@
output.append("<TABLE border=1>");
output.append("<TR><TD colspan=2>Validation Results</TD></TR>");
appendLine("Result from isPossibleNumber()", Boolean.toString(isPossible), output);
- if (isPossible) {
- if (phoneUtil.isPossibleNumberWithReason(number)
- == ValidationResult.IS_POSSIBLE_LOCAL_ONLY) {
- appendLine("Result from isPossibleNumberWithReason()", "IS_POSSIBLE_LOCAL_ONLY", output);
- output.append(
- "<TR><TD colspan=2>Number is considered invalid as it is "
- + "not a possible national number.</TD></TR>");
- } else {
- appendLine("Result from isValidNumber()", Boolean.toString(isNumberValid), output);
- if (isNumberValid && hasDefaultCountry) {
- appendLine(
- "Result from isValidNumberForRegion()",
- Boolean.toString(phoneUtil.isValidNumberForRegion(number, defaultCountry)),
- output);
- }
- String region = phoneUtil.getRegionCodeForNumber(number);
- appendLine("Phone Number region", region == null ? "" : region, output);
- appendLine("Result from getNumberType()", numberType.toString(), output);
- }
+ if (!isPossible) {
+ appendLine("Result from isPossibleNumberWithReason()",
+ phoneUtil.isPossibleNumberWithReason(number).toString(), output);
+ output.append("<TR><TD colspan=2>Note: numbers that are not possible have type " +
+ "UNKNOWN, an unknown region, and are considered invalid.</TD></TR>");
} else {
- appendLine(
- "Result from isPossibleNumberWithReason()",
- phoneUtil.isPossibleNumberWithReason(number).toString(),
- output);
- output.append(
- "<TR><TD colspan=2>Note: Numbers that are not possible have type UNKNOWN,"
- + " an unknown region, and are considered invalid.</TD></TR>");
+ appendLine("Result from isValidNumber()", Boolean.toString(isNumberValid), output);
+ if (isNumberValid) {
+ if (hasDefaultCountry) {
+ appendLine(
+ "Result from isValidNumberForRegion()",
+ Boolean.toString(phoneUtil.isValidNumberForRegion(number, defaultCountry)),
+ output);
+ }
+ }
+ String region = phoneUtil.getRegionCodeForNumber(number);
+ appendLine("Phone Number region", region == null ? "" : region, output);
+ appendLine("Result from getNumberType()", numberType.toString(), output);
}
output.append("</TABLE>");
output.append("</DIV>");
@@ -318,25 +303,20 @@
output.append("<TABLE border=1>");
output.append("<TR><TD colspan=2>Short Number Results</TD></TR>");
boolean isPossibleShort = shortInfo.isPossibleShortNumber(number);
- appendLine(
- "Result from isPossibleShortNumber()", Boolean.toString(isPossibleShort), output);
+ appendLine("Result from isPossibleShortNumber()",
+ Boolean.toString(isPossibleShort), output);
if (isPossibleShort) {
- appendLine(
- "Result from isValidShortNumber()",
- Boolean.toString(shortInfo.isValidShortNumber(number)),
- output);
+ appendLine("Result from isValidShortNumber()",
+ Boolean.toString(shortInfo.isValidShortNumber(number)), output);
if (hasDefaultCountry) {
boolean isPossibleShortForRegion =
shortInfo.isPossibleShortNumberForRegion(number, defaultCountry);
- appendLine(
- "Result from isPossibleShortNumberForRegion()",
- Boolean.toString(isPossibleShortForRegion),
- output);
+ appendLine("Result from isPossibleShortNumberForRegion()",
+ Boolean.toString(isPossibleShortForRegion), output);
if (isPossibleShortForRegion) {
- appendLine(
- "Result from isValidShortNumberForRegion()",
- Boolean.toString(shortInfo.isValidShortNumberForRegion(number, defaultCountry)),
- output);
+ appendLine("Result from isValidShortNumberForRegion()",
+ Boolean.toString(shortInfo.isValidShortNumberForRegion(number,
+ defaultCountry)), output);
}
}
}
@@ -347,12 +327,11 @@
output.append("<DIV>");
output.append("<TABLE border=1>");
output.append("<TR><TD colspan=2>Formatting Results</TD></TR>");
- appendLine(
- "E164 format",
- isNumberValid ? phoneUtil.format(number, PhoneNumberFormat.E164) : "invalid",
- output);
- appendLine(
- "Original format", phoneUtil.formatInOriginalFormat(number, defaultCountry), output);
+ appendLine("E164 format",
+ isNumberValid ? phoneUtil.format(number, PhoneNumberFormat.E164) : "invalid",
+ output);
+ appendLine("Original format",
+ phoneUtil.formatInOriginalFormat(number, defaultCountry), output);
appendLine("National format", phoneUtil.format(number, PhoneNumberFormat.NATIONAL), output);
appendLine(
"International format",
@@ -378,8 +357,8 @@
// Note this doesn't handle supplementary characters, but it shouldn't be a big deal as
// there are no dial-pad characters in the supplementary range.
char inputChar = phoneNumber.charAt(i);
- appendLine(
- "Char entered: '" + inputChar + "' Output: ", formatter.inputDigit(inputChar), output);
+ appendLine("Char entered: '" + inputChar + "' Output: ",
+ formatter.inputDigit(inputChar), output);
}
output.append("</TABLE>");
output.append("</DIV>");
@@ -390,8 +369,8 @@
output.append("<TR><TD colspan=2>PhoneNumberOfflineGeocoder Results</TD></TR>");
appendLine(
"Location",
- PhoneNumberOfflineGeocoder.getInstance()
- .getDescriptionForNumber(number, geocodingLocale),
+ PhoneNumberOfflineGeocoder.getInstance().getDescriptionForNumber(
+ number, geocodingLocale),
output);
output.append("</TABLE>");
output.append("</DIV>");
@@ -406,9 +385,9 @@
output.append("</TABLE>");
output.append("</DIV>");
- if (numberType == PhoneNumberType.MOBILE
- || numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE
- || numberType == PhoneNumberType.PAGER) {
+ if (numberType == PhoneNumberType.MOBILE ||
+ numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE ||
+ numberType == PhoneNumberType.PAGER) {
output.append("<DIV>");
output.append("<TABLE border=1>");
output.append("<TR><TD colspan=2>PhoneNumberToCarrierMapper Results</TD></TR>");
@@ -424,14 +403,10 @@
String newIssueLink = getNewIssueLink(phoneNumber, defaultCountry, geocodingLocale);
String guidelinesLink =
"https://github.com/google/libphonenumber/blob/master/CONTRIBUTING.md";
- output.append(
- "<b style=\"color:red\">File an issue</b>: by clicking on "
- + "<a target=\"_blank\" href=\""
- + newIssueLink
- + "\">this link</a>, I confirm that I "
- + "have read the <a target=\"_blank\" href=\""
- + guidelinesLink
- + "\">contributor's guidelines</a>.");
+ output.append("<b style=\"color:red\">File an issue</b>: by clicking on "
+ + "<a target=\"_blank\" href=\"" + newIssueLink + "\">this link</a>, I confirm that I "
+ + "have read the <a target=\"_blank\" href=\"" + guidelinesLink
+ + "\">contributor's guidelines</a>.");
} catch (NumberParseException e) {
output.append(StringEscapeUtils.escapeHtml(e.toString()));
}
diff --git a/demo/war/WEB-INF/lib/servlet-api-2.5.jar b/demo/war/WEB-INF/lib/servlet-api-2.5.jar
deleted file mode 100644
index fb52493..0000000
--- a/demo/war/WEB-INF/lib/servlet-api-2.5.jar
+++ /dev/null
Binary files differ
diff --git a/geocoder/pom.xml b/geocoder/pom.xml
index 37c7cc3..f6cd9b0 100644
--- a/geocoder/pom.xml
+++ b/geocoder/pom.xml
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>geocoder</artifactId>
- <version>2.182</version>
+ <version>2.127</version>
<packaging>jar</packaging>
<url>https://github.com/google/libphonenumber/</url>
<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
</parent>
<build>
@@ -63,12 +63,12 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>prefixmapper</artifactId>
- <version>2.182</version>
+ <version>2.127</version>
</dependency>
</dependencies>
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
index f029b46..e3f0c0b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1326_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1326_en
deleted file mode 100644
index a9ac6ec..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1326_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1340_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1340_en
deleted file mode 100644
index 04c9397..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1340_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
index bd11fc2..cc5f70e 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1367_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1367_en
deleted file mode 100644
index 7c1b37e..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1367_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1368_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1368_en
deleted file mode 100644
index 7107ece..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1368_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en
new file mode 100644
index 0000000..024ff72
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1447_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1447_en
deleted file mode 100644
index 6924dec..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1447_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1448_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1448_en
deleted file mode 100644
index 352dd5e..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1448_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1464_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1464_en
deleted file mode 100644
index 435c6f7..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1464_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1474_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1474_en
deleted file mode 100644
index 6f08106..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1474_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1572_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1572_en
deleted file mode 100644
index 0f8e15b..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1572_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1582_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1582_en
deleted file mode 100644
index 7d5f7c5..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1582_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1659_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1659_en
deleted file mode 100644
index 0c78c72..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1659_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1672_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1672_en
deleted file mode 100644
index 6d2e060..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1672_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1771_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1771_en
deleted file mode 100644
index 8cc22d5..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1771_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1839_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1839_en
deleted file mode 100644
index 32e5f3e..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1839_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1840_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1840_en
deleted file mode 100644
index a9faf2a..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1840_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en
index 42c43eb..4440fe7 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
index d5c0c4a..05fbabf 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1945_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1945_en
deleted file mode 100644
index 523a8aa..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1945_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
index 2ae8176..b89c9e0 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
index 9016b0d..f6b1176 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
index 9bdb587..7a1379c 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
index 10e20d1..9af2d13 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
index b6ec690..8c81542 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
index 81be19a..6ef28be 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
index 1936bb2..87a8cc1 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
index c0340bf..94734b8 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
index 47e1916..747091b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
index 5bafef1..416e875 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en
index ef8dd43..da1af17 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/236_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/236_en
deleted file mode 100644
index 314832a..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/236_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
index 6367de8..092d85a 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
index 64095f9..0848427 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
index f2b6c5a..007eb7c 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
index 7b8224f..7b2d9fc 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en
index 9826d45..8043293 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
index 066ad25..0a06611 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en
index 21fffa1..6aea638 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
index 06afe7f..1f877a6 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en
index c94e139..e7f6f16 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
index eb983e1..e6424bb 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
index 4e81c8a..77a25fc 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
index 3ab2985..652bfda 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de
index e0bdb81..4c80c16 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en
index 26e14b4..ad888cc 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
index d9fdcd0..b207f52 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
index 15b7906..2e85aa2 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en
index b49d48c..f2fffb5 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
index 658550c..eeee7e4 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy
index d2333d4..1d11627 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
index 7d52318..9f0226f 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en
index 32b5f39..4626068 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/386_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/386_en
deleted file mode 100644
index 115cf8f..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/386_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
index 2d83434..e3b6913 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en
index e513c68..5a5dc09 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en
index 14c8da3..40fd28d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
index b40793e..3e19613 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
index 35bada2..0e30c33 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
new file mode 100644
index 0000000..31a27a8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
index 828e127..91d9f47 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
index ae26ed3..428b8bf 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
index 0c7aaae..11f59e4 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
index d9487c9..d8eabc4 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
index e51cd55..c8e25d4 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es
index 7fc1659..7f5de7c 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
index 5324582..77d1fee 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
index ce16598..3955d71 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
index f0e057e..a6724ae 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
index 45107ee..b453a4e 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
index ec254fa..347d96b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
index 54ba222..2bf005e 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
index 4def98a..5e85d0c 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/593_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/593_en
deleted file mode 100644
index 551bd93..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/593_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/595_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/595_en
deleted file mode 100644
index e6307d4..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/595_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/598_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/598_en
deleted file mode 100644
index 3d486db..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/598_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
index 4db9fde..54bef5f 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en
index 3b71403..1e21374 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en
index e56bfb9..123a41c 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/63_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/63_en
deleted file mode 100644
index a7d08a1..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/63_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en
index 835a1aa..8e56425 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
index 4a5546c..cb2807d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
index d68b623..5e86e0b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/670_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/670_en
deleted file mode 100644
index 2483baa..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/670_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/672_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/672_en
deleted file mode 100644
index 4f75473..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/672_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/673_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/673_en
deleted file mode 100644
index 1c6166b..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/673_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/678_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/678_en
deleted file mode 100644
index 96bb067..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/678_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/679_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/679_en
deleted file mode 100644
index 698326f..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/679_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en
index 3a4b011..64d9cd4 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/682_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/682_en
deleted file mode 100644
index 8efd06d..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/682_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/685_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/685_en
deleted file mode 100644
index f437acd..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/685_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
index 32876c4..1697bec 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/689_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/689_en
deleted file mode 100644
index 95e8315..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/689_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/690_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/690_en
deleted file mode 100644
index e0aea52..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/690_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
index efc7c54..19e0566 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
index afce4a6..7ac8a63 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
index d5d7ac5..8adf529 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
index d301aa0..2153b5a 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/850_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/850_en
deleted file mode 100644
index dd382d0..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/850_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en
index 14db15a..febe191 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
index fdaa487..ef765f5 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
index 923fe0a..e250685 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
index 4800528..3ab469b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/92_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/92_en
deleted file mode 100644
index 8561f83..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/92_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
index 886e42a..7fab12a 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/961_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/961_en
deleted file mode 100644
index fde8990..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/961_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
index c4d61bc..37a2bf8 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/963_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/963_en
deleted file mode 100644
index 065e356..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/963_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/967_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/967_en
deleted file mode 100644
index 3d2ffc8..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/967_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/970_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/970_en
deleted file mode 100644
index 43a8e95..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/970_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/971_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/971_en
deleted file mode 100644
index 48273fa..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/971_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/993_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/993_en
deleted file mode 100644
index cd0e4cf..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/993_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
index b3eadf7..69468e9 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/995_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/995_en
deleted file mode 100644
index 89b3600..0000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/995_en
+++ /dev/null
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
index 16d44e6..46b794d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
index 4965989..7c428d0 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
index a2c80e6..330087d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
+++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
Binary files differ
diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml
index 47770b8..32f78ea 100644
--- a/internal/prefixmapper/pom.xml
+++ b/internal/prefixmapper/pom.xml
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>prefixmapper</artifactId>
- <version>2.182</version>
+ <version>2.127</version>
<packaging>jar</packaging>
<url>https://github.com/google/libphonenumber/</url>
<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -50,7 +50,7 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
</dependency>
</dependencies>
diff --git a/lib/junit-4.13.1.jar b/lib/junit-4.13.1.jar
deleted file mode 100644
index b376ffc..0000000
--- a/lib/junit-4.13.1.jar
+++ /dev/null
Binary files differ
diff --git a/lib/junit-4.8.1.jar b/lib/junit-4.8.1.jar
new file mode 100644
index 0000000..524cd65
--- /dev/null
+++ b/lib/junit-4.8.1.jar
Binary files differ
diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml
index eb16316..c673de1 100644
--- a/libphonenumber/pom.xml
+++ b/libphonenumber/pom.xml
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
<packaging>jar</packaging>
<url>https://github.com/google/libphonenumber/</url>
<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
</parent>
<build>
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java b/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
index 834c9d8..cdbd72d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
@@ -26,9 +26,9 @@
public class AlternateFormatsCountryCodeSet {
// A set of all country codes for which data is available.
static Set<Integer> getCountryCodeSet() {
- // The capacity is set to 61 as there are 46 different entries,
+ // The capacity is set to 62 as there are 47 different entries,
// and this offers a load factor of roughly 0.75.
- Set<Integer> countryCodeSet = new HashSet<Integer>(61);
+ Set<Integer> countryCodeSet = new HashSet<Integer>(62);
countryCodeSet.add(7);
countryCodeSet.add(27);
@@ -46,6 +46,7 @@
countryCodeSet.add(58);
countryCodeSet.add(61);
countryCodeSet.add(62);
+ countryCodeSet.add(63);
countryCodeSet.add(64);
countryCodeSet.add(66);
countryCodeSet.add(81);
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
index be11be5..a0d9957 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -62,7 +62,7 @@
// code, from the national number.
private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' ';
private static final PhoneMetadata EMPTY_METADATA =
- PhoneMetadata.newBuilder().setId("<ignored>").setInternationalPrefix("NA").build();
+ new PhoneMetadata().setInternationalPrefix("NA");
private PhoneMetadata defaultMetadata;
private PhoneMetadata currentMetadata;
@@ -70,12 +70,10 @@
// used by the AYTF. It is eligible when the format element under numberFormat contains groups of
// the dollar sign followed by a single digit, separated by valid phone number punctuation. This
// prevents invalid punctuation (such as the star sign in Israeli star numbers) getting into the
- // output of the AYTF. We require that the first group is present in the output pattern to ensure
- // no data is lost while formatting; when we format as you type, this should always be the case.
+ // output of the AYTF.
private static final Pattern ELIGIBLE_FORMAT_PATTERN =
Pattern.compile("[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*"
- + "\\$1" + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*(\\$\\d"
- + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*)*");
+ + "(\\$\\d" + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*)+");
// A set of characters that, if found in a national prefix formatting rules, are an indicator to
// us that we should separate the national prefix from the number when formatting.
private static final Pattern NATIONAL_PREFIX_SEPARATORS_PATTERN = Pattern.compile("[- ]");
@@ -168,9 +166,9 @@
// First decide whether we should use international or national number rules.
boolean isInternationalNumber = isCompleteNumber && extractedNationalPrefix.length() == 0;
List<NumberFormat> formatList =
- (isInternationalNumber && currentMetadata.getIntlNumberFormatCount() > 0)
- ? currentMetadata.getIntlNumberFormatList()
- : currentMetadata.getNumberFormatList();
+ (isInternationalNumber && currentMetadata.intlNumberFormatSize() > 0)
+ ? currentMetadata.intlNumberFormats()
+ : currentMetadata.numberFormats();
for (NumberFormat format : formatList) {
// Discard a few formats that we know are not relevant based on the presence of the national
// prefix.
@@ -205,12 +203,12 @@
Iterator<NumberFormat> it = possibleFormats.iterator();
while (it.hasNext()) {
NumberFormat format = it.next();
- if (format.getLeadingDigitsPatternCount() == 0) {
+ if (format.leadingDigitsPatternSize() == 0) {
// Keep everything that isn't restricted by leading digits.
continue;
}
int lastLeadingDigitsPattern =
- Math.min(indexOfLeadingDigitsPattern, format.getLeadingDigitsPatternCount() - 1);
+ Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1);
Pattern leadingDigitsPattern = regexCache.getPatternForRegex(
format.getLeadingDigitsPattern(lastLeadingDigitsPattern));
Matcher m = leadingDigitsPattern.matcher(leadingDigits);
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
index c7bde8e..0cb73fd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
@@ -578,8 +578,8 @@
MetadataManager.getAlternateFormatsForCountry(number.getCountryCode());
String nationalSignificantNumber = util.getNationalSignificantNumber(number);
if (alternateFormats != null) {
- for (NumberFormat alternateFormat : alternateFormats.getNumberFormatList()) {
- if (alternateFormat.getLeadingDigitsPatternCount() > 0) {
+ for (NumberFormat alternateFormat : alternateFormats.numberFormats()) {
+ if (alternateFormat.leadingDigitsPatternSize() > 0) {
// There is only one leading digits pattern for alternate formats.
Pattern pattern =
regexCache.getPatternForRegex(alternateFormat.getLeadingDigitsPattern(0));
@@ -667,7 +667,7 @@
// Check if a national prefix should be present when formatting this number.
String nationalNumber = util.getNationalSignificantNumber(number);
NumberFormat formatRule =
- util.chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
+ util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
// To do this, we check that a national prefix formatting rule was present and that it wasn't
// just the first-group symbol ($1) with punctuation.
if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) {
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 646b134..a725a03 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -303,98 +303,46 @@
// as the default extension prefix. This can be overridden by region-specific preferences.
private static final String DEFAULT_EXTN_PREFIX = " ext. ";
+ // Pattern to capture digits used in an extension. Places a maximum length of "7" for an
+ // extension.
+ private static final String CAPTURING_EXTN_DIGITS = "(" + DIGITS + "{1,7})";
// Regexp of all possible ways to write extensions, for use when parsing. This will be run as a
// case-insensitive regexp match. Wide character versions are also provided after each ASCII
// version.
- private static final String EXTN_PATTERNS_FOR_PARSING = createExtnPattern(true);
- static final String EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(false);
-
- /**
- * Helper method for constructing regular expressions for parsing. Creates an expression that
- * captures up to maxLength digits.
- */
- private static String extnDigits(int maxLength) {
- return "(" + DIGITS + "{1," + maxLength + "})";
+ private static final String EXTN_PATTERNS_FOR_PARSING;
+ static final String EXTN_PATTERNS_FOR_MATCHING;
+ static {
+ // One-character symbols that can be used to indicate an extension.
+ String singleExtnSymbolsForMatching = "x\uFF58#\uFF03~\uFF5E";
+ // For parsing, we are slightly more lenient in our interpretation than for matching. Here we
+ // allow "comma" and "semicolon" as possible extension indicators. When matching, these are
+ // hardly ever used to indicate this.
+ String singleExtnSymbolsForParsing = ",;" + singleExtnSymbolsForMatching;
+
+ EXTN_PATTERNS_FOR_PARSING = createExtnPattern(singleExtnSymbolsForParsing);
+ EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(singleExtnSymbolsForMatching);
}
/**
- * Helper initialiser method to create the regular-expression pattern to match extensions.
- * Note that there are currently six capturing groups for the extension itself. If this number is
- * changed, MaybeStripExtension needs to be updated.
+ * Helper initialiser method to create the regular-expression pattern to match extensions,
+ * allowing the one-char extension symbols provided by {@code singleExtnSymbols}.
*/
- private static String createExtnPattern(boolean forParsing) {
- // We cap the maximum length of an extension based on the ambiguity of the way the extension is
- // prefixed. As per ITU, the officially allowed length for extensions is actually 40, but we
- // don't support this since we haven't seen real examples and this introduces many false
- // interpretations as the extension labels are not standardized.
- int extLimitAfterExplicitLabel = 20;
- int extLimitAfterLikelyLabel = 15;
- int extLimitAfterAmbiguousChar = 9;
- int extLimitWhenNotSure = 6;
-
- String possibleSeparatorsBetweenNumberAndExtLabel = "[ \u00A0\\t,]*";
- // Optional full stop (.) or colon, followed by zero or more spaces/tabs/commas.
- String possibleCharsAfterExtLabel = "[:\\.\uFF0E]?[ \u00A0\\t,-]*";
- String optionalExtnSuffix = "#?";
-
- // Here the extension is called out in more explicit way, i.e mentioning it obvious patterns
- // like "ext.". Canonical-equivalence doesn't seem to be an option with Android java, so we
- // allow two options for representing the accented o - the character itself, and one in the
- // unicode decomposed form with the combining acute accent.
- String explicitExtLabels =
- "(?:e?xt(?:ensi(?:o\u0301?|\u00F3))?n?|\uFF45?\uFF58\uFF54\uFF4E?|\u0434\u043E\u0431|anexo)";
- // One-character symbols that can be used to indicate an extension, and less commonly used
- // or more ambiguous extension labels.
- String ambiguousExtLabels = "(?:[x\uFF58#\uFF03~\uFF5E]|int|\uFF49\uFF4E\uFF54)";
- // When extension is not separated clearly.
- String ambiguousSeparator = "[- ]+";
-
- String rfcExtn = RFC3966_EXTN_PREFIX + extnDigits(extLimitAfterExplicitLabel);
- String explicitExtn = possibleSeparatorsBetweenNumberAndExtLabel + explicitExtLabels
- + possibleCharsAfterExtLabel + extnDigits(extLimitAfterExplicitLabel)
- + optionalExtnSuffix;
- String ambiguousExtn = possibleSeparatorsBetweenNumberAndExtLabel + ambiguousExtLabels
- + possibleCharsAfterExtLabel + extnDigits(extLimitAfterAmbiguousChar) + optionalExtnSuffix;
- String americanStyleExtnWithSuffix = ambiguousSeparator + extnDigits(extLimitWhenNotSure) + "#";
-
- // The first regular expression covers RFC 3966 format, where the extension is added using
- // ";ext=". The second more generic where extension is mentioned with explicit labels like
- // "ext:". In both the above cases we allow more numbers in extension than any other extension
- // labels. The third one captures when single character extension labels or less commonly used
- // labels are used. In such cases we capture fewer extension digits in order to reduce the
- // chance of falsely interpreting two numbers beside each other as a number + extension. The
- // fourth one covers the special case of American numbers where the extension is written with a
- // hash at the end, such as "- 503#".
- String extensionPattern =
- rfcExtn + "|"
- + explicitExtn + "|"
- + ambiguousExtn + "|"
- + americanStyleExtnWithSuffix;
- // Additional pattern that is supported when parsing extensions, not when matching.
- if (forParsing) {
- // This is same as possibleSeparatorsBetweenNumberAndExtLabel, but not matching comma as
- // extension label may have it.
- String possibleSeparatorsNumberExtLabelNoComma = "[ \u00A0\\t]*";
- // ",," is commonly used for auto dialling the extension when connected. First comma is matched
- // through possibleSeparatorsBetweenNumberAndExtLabel, so we do not repeat it here. Semi-colon
- // works in Iphone and Android also to pop up a button with the extension number following.
- String autoDiallingAndExtLabelsFound = "(?:,{2}|;)";
-
- String autoDiallingExtn = possibleSeparatorsNumberExtLabelNoComma
- + autoDiallingAndExtLabelsFound + possibleCharsAfterExtLabel
- + extnDigits(extLimitAfterLikelyLabel) + optionalExtnSuffix;
- String onlyCommasExtn = possibleSeparatorsNumberExtLabelNoComma
- + "(?:,)+" + possibleCharsAfterExtLabel + extnDigits(extLimitAfterAmbiguousChar)
- + optionalExtnSuffix;
- // Here the first pattern is exclusively for extension autodialling formats which are used
- // when dialling and in this case we accept longer extensions. However, the second pattern
- // is more liberal on the number of commas that acts as extension labels, so we have a strict
- // cap on the number of digits in such extensions.
- return extensionPattern + "|"
- + autoDiallingExtn + "|"
- + onlyCommasExtn;
- }
- return extensionPattern;
+ private static String createExtnPattern(String singleExtnSymbols) {
+ // There are three regular expressions here. The first covers RFC 3966 format, where the
+ // extension is added using ";ext=". The second more generic one starts with optional white
+ // space and ends with an optional full stop (.), followed by zero or more spaces/tabs/commas
+ // and then the numbers themselves. The other one covers the special case of American numbers
+ // where the extension is written with a hash at the end, such as "- 503#"
+ // Note that the only capturing groups should be around the digits that you want to capture as
+ // part of the extension, or else parsing will fail!
+ // Canonical-equivalence doesn't seem to be an option with Android java, so we allow two options
+ // for representing the accented o - the character itself, and one in the unicode decomposed
+ // form with the combining acute accent.
+ return (RFC3966_EXTN_PREFIX + CAPTURING_EXTN_DIGITS + "|" + "[ \u00A0\\t,]*"
+ + "(?:e?xt(?:ensi(?:o\u0301?|\u00F3))?n?|\uFF45?\uFF58\uFF54\uFF4E?|"
+ + "\u0434\u043E\u0431|" + "[" + singleExtnSymbols + "]|int|anexo|\uFF49\uFF4E\uFF54)"
+ + "[:\\.\uFF0E]?[ \u00A0\\t,-]*" + CAPTURING_EXTN_DIGITS + "#?|"
+ + "[- ]+(" + DIGITS + "{1,5})#");
}
// Regexp of all known extension prefixes used by different regions followed by 1 or more valid
@@ -1358,7 +1306,7 @@
}
}
formattedNumber.append(
- formatNsnUsingPattern(nationalSignificantNumber, numFormatCopy.build(), numberFormat));
+ formatNsnUsingPattern(nationalSignificantNumber, numFormatCopy, numberFormat));
}
maybeAppendFormattedExtension(number, metadata, numberFormat, formattedNumber);
prefixNumberWithCountryCallingCode(countryCallingCode, numberFormat, formattedNumber);
@@ -1576,15 +1524,14 @@
PhoneMetadata metadataForRegionCallingFrom = getMetadataForRegion(regionCallingFrom);
String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix();
- // In general, if there is a preferred international prefix, use that. Otherwise, for regions
- // that have multiple international prefixes, the international format of the number is
- // returned since we would not know which one to use.
+ // For regions that have multiple international prefixes, the international format of the
+ // number is returned, unless there is a preferred international prefix.
String internationalPrefixForFormatting = "";
- if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) {
+ if (SINGLE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) {
+ internationalPrefixForFormatting = internationalPrefix;
+ } else if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) {
internationalPrefixForFormatting =
metadataForRegionCallingFrom.getPreferredInternationalPrefix();
- } else if (SINGLE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) {
- internationalPrefixForFormatting = internationalPrefix;
}
String regionCode = getRegionCodeForCountryCode(countryCallingCode);
@@ -1668,7 +1615,7 @@
PhoneMetadata metadata = getMetadataForRegion(regionCode);
String nationalNumber = getNationalSignificantNumber(number);
NumberFormat formatRule =
- chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
+ chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
// The format rule could still be null here if the national number was 0 and there was no
// raw input (this should not be possible for numbers generated by the phonenumber library
// as they would also not have a country calling code and we would have exited earlier).
@@ -1700,7 +1647,7 @@
numFormatCopy.mergeFrom(formatRule);
numFormatCopy.clearNationalPrefixFormattingRule();
List<NumberFormat> numberFormats = new ArrayList<NumberFormat>(1);
- numberFormats.add(numFormatCopy.build());
+ numberFormats.add(numFormatCopy);
formattedNumber = formatByPattern(number, PhoneNumberFormat.NATIONAL, numberFormats);
break;
}
@@ -1747,7 +1694,7 @@
}
String nationalNumber = getNationalSignificantNumber(number);
NumberFormat formatRule =
- chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
+ chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
return formatRule != null;
}
@@ -1811,7 +1758,7 @@
} else if (metadataForRegionCallingFrom != null
&& countryCode == getCountryCodeForValidRegion(regionCallingFrom)) {
NumberFormat formattingPattern =
- chooseFormattingPatternForNumber(metadataForRegionCallingFrom.getNumberFormatList(),
+ chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormats(),
nationalNumber);
if (formattingPattern == null) {
// If no pattern above is matched, we format the original input.
@@ -1828,7 +1775,7 @@
// This will not work in the cases where the pattern (and not the leading digits) decide
// whether a national prefix needs to be used, since we have overridden the pattern to match
// anything, but that is not the case in the metadata to date.
- return formatNsnUsingPattern(rawInput, newFormat.build(), PhoneNumberFormat.NATIONAL);
+ return formatNsnUsingPattern(rawInput, newFormat, PhoneNumberFormat.NATIONAL);
}
String internationalPrefixForFormatting = "";
// If an unsupported region-calling-from is entered, or a country with multiple international
@@ -1921,13 +1868,13 @@
PhoneMetadata metadata,
PhoneNumberFormat numberFormat,
CharSequence carrierCode) {
- List<NumberFormat> intlNumberFormats = metadata.getIntlNumberFormatList();
+ List<NumberFormat> intlNumberFormats = metadata.intlNumberFormats();
// When the intlNumberFormats exists, we use that to format national number for the
// INTERNATIONAL format instead of using the numberDesc.numberFormats.
List<NumberFormat> availableFormats =
(intlNumberFormats.size() == 0 || numberFormat == PhoneNumberFormat.NATIONAL)
- ? metadata.getNumberFormatList()
- : metadata.getIntlNumberFormatList();
+ ? metadata.numberFormats()
+ : metadata.intlNumberFormats();
NumberFormat formattingPattern = chooseFormattingPatternForNumber(availableFormats, number);
return (formattingPattern == null)
? number
@@ -1937,7 +1884,7 @@
NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats,
String nationalNumber) {
for (NumberFormat numFormat : availableFormats) {
- int size = numFormat.getLeadingDigitsPatternCount();
+ int size = numFormat.leadingDigitsPatternSize();
if (size == 0 || regexCache.getPatternForRegex(
// We always use the last leading_digits_pattern, as it is the most detailed.
numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) {
@@ -2589,7 +2536,7 @@
// Note that when adding the possible lengths from mobile, we have to again check they
// aren't empty since if they are this indicates they are the same as the general desc and
// should be obtained from there.
- possibleLengths.addAll(mobileDesc.getPossibleLengthCount() == 0
+ possibleLengths.addAll(mobileDesc.getPossibleLengthList().size() == 0
? metadata.getGeneralDesc().getPossibleLengthList()
: mobileDesc.getPossibleLengthList());
// The current list is sorted; we need to merge in the new list and re-sort (duplicates
@@ -3571,6 +3518,6 @@
logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode);
return false;
}
- return metadata.getMobileNumberPortableRegion();
+ return metadata.isMobileNumberPortableRegion();
}
}
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java
index 8517c79..e2ef122 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java
@@ -102,9 +102,7 @@
public java.util.List<String> leadingDigitPatterns() {
return leadingDigitsPattern_;
}
- @Deprecated
- public int leadingDigitsPatternSize() { return getLeadingDigitsPatternCount(); }
- public int getLeadingDigitsPatternCount() { return leadingDigitsPattern_.size(); }
+ public int leadingDigitsPatternSize() { return leadingDigitsPattern_.size(); }
public String getLeadingDigitsPattern(int index) {
return leadingDigitsPattern_.get(index);
}
@@ -363,16 +361,6 @@
public PhoneMetadata build() {
return this;
}
-
- public Builder setId(String value) {
- super.setId(value);
- return this;
- }
-
- public Builder setInternationalPrefix(String value) {
- super.setInternationalPrefix(value);
- return this;
- }
}
public static Builder newBuilder() {
return new Builder();
@@ -383,12 +371,6 @@
private PhoneNumberDesc generalDesc_ = null;
public boolean hasGeneralDesc() { return hasGeneralDesc; }
public PhoneNumberDesc getGeneralDesc() { return generalDesc_; }
- public PhoneNumberDesc getGeneralDescBuilder() {
- if (generalDesc_ == null) {
- generalDesc_ = new PhoneNumberDesc();
- }
- return generalDesc_ ;
- }
public PhoneMetadata setGeneralDesc(PhoneNumberDesc value) {
if (value == null) {
throw new NullPointerException();
@@ -748,16 +730,10 @@
// repeated NumberFormat number_format = 19;
private java.util.List<NumberFormat> numberFormat_ = new java.util.ArrayList<NumberFormat>();
- @Deprecated
public java.util.List<NumberFormat> numberFormats() {
- return getNumberFormatList();
- }
- public java.util.List<NumberFormat> getNumberFormatList() {
return numberFormat_;
}
- @Deprecated
- public int numberFormatSize() { return getNumberFormatCount(); }
- public int getNumberFormatCount() { return numberFormat_.size(); }
+ public int numberFormatSize() { return numberFormat_.size(); }
public NumberFormat getNumberFormat(int index) {
return numberFormat_.get(index);
}
@@ -772,16 +748,10 @@
// repeated NumberFormat intl_number_format = 20;
private java.util.List<NumberFormat> intlNumberFormat_ =
new java.util.ArrayList<NumberFormat>();
- @Deprecated
public java.util.List<NumberFormat> intlNumberFormats() {
- return getIntlNumberFormatList();
- }
- public java.util.List<NumberFormat> getIntlNumberFormatList() {
return intlNumberFormat_;
}
- @Deprecated
- public int intlNumberFormatSize() { return getIntlNumberFormatCount(); }
- public int getIntlNumberFormatCount() { return intlNumberFormat_.size(); }
+ public int intlNumberFormatSize() { return intlNumberFormat_.size(); }
public NumberFormat getIntlNumberFormat(int index) {
return intlNumberFormat_.get(index);
}
@@ -848,9 +818,7 @@
private boolean hasMobileNumberPortableRegion;
private boolean mobileNumberPortableRegion_ = false;
public boolean hasMobileNumberPortableRegion() { return hasMobileNumberPortableRegion; }
- @Deprecated
- public boolean isMobileNumberPortableRegion() { return getMobileNumberPortableRegion(); }
- public boolean getMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
+ public boolean isMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
public PhoneMetadata setMobileNumberPortableRegion(boolean value) {
hasMobileNumberPortableRegion = true;
mobileNumberPortableRegion_ = value;
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
index 4b5e8b0..91aa870 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
@@ -26,9 +26,9 @@
public class ShortNumbersRegionCodeSet {
// A set of all region codes for which data is available.
static Set<String> getRegionCodeSet() {
- // The capacity is set to 321 as there are 241 different entries,
+ // The capacity is set to 320 as there are 240 different entries,
// and this offers a load factor of roughly 0.75.
- Set<String> regionCodeSet = new HashSet<String>(321);
+ Set<String> regionCodeSet = new HashSet<String>(320);
regionCodeSet.add("AC");
regionCodeSet.add("AD");
@@ -231,7 +231,6 @@
regionCodeSet.add("SN");
regionCodeSet.add("SO");
regionCodeSet.add("SR");
- regionCodeSet.add("SS");
regionCodeSet.add("ST");
regionCodeSet.add("SV");
regionCodeSet.add("SX");
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
index 015808a..5e10270 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
index 4d46fcf..d03d525 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
index 8f8615d..1e50e33 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
index 6806a00..ac762db 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
index 0500b27..ef8f6b9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
index 8fac331..fe18ba0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
index c26e30d..89d4f92 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
index 62b7502..2c8b5d5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
index 6813bd5..590270a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
index a84d878..24f6ff3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
index 66dd630..f70855f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
index 17508f9..59ef115 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
index dfe5078..11ed135 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
index 6ba5be4..fa9d67f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
index 3af1e38..46f7d48 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
index cb06fb8..7774283 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index 41c0092..518d27a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
index 29424fb..0bfb1c8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
index a54f4ca..1edc8ec 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
index 8367ee9..0e27752 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
index 9da6fb1..8a07a99 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
index 6cb25d7..9011103 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
index 401dafe..cdfe19b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
index 339334b..af69fa2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
index 71e260e..a745616 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
index 01bb8da..0ebc3f8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index dc01444..99930e0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
index 37bcc55..ae149cc 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 3214db5..2fc3fcb 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
index 8fa119b..cb1ca40 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
index bb43464..ea1d50e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
index 8dc7785..975e243 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
index efa9b05..263dda5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
index 06ea519..c5c88df 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
index 8c39610..3a02a3d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
index ed648e4..871bc2a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
index 6ccdd69..82c1b46 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
index e1cab68..f6de5b1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
index 21bc809..ed1330d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
index 5e981c8..9129855 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
index b29ac00..702957a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
index 7f8a039..66c94bf 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
index 8236543..afdb010 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
index e7e30ac..2260b6a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
index 8d341fb..f37beaf 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
index d98c24a..ba1b00f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
index ddebc8f..01977cc 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
index 283e679..f07ac53 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
index 3f7fcbb..a34eebe 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
index 492f70a..5ae18de 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
index 602a712..784fbc3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
index fcd3965..c5e3a73 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
index c06344a..c7a35b3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
index bfa1f13..201c513 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
index 3a938df..e7ac5d9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index ebb5fb4..750a818 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
index dc4b525..e3e520f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
index 2b89782..64ecb2d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
index 5a7271e..2de0b7d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
index 051f503..bf25f42 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
index 6128ffe..adcbef3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index cdfd1f8..75c7e4e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index b8763e6..05362f0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
index 4316331..c50382b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
index 0287104..cf08564 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
index 33d742f..555cd7f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
index 5a377cf..4f1787a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
index 4520dc9..c4a58d5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
index c7ee185..818108b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
index d52abcf..fd88ec8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
index 4f5eea5..f75507b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
index b11e9fd..75ebe2a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
index e11e957..95116db 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
index 009e48a..46262b9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
index 8a056eb..cc84dd5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
index e1da75c..df48e2e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index 296fcf9..e35c866 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
index b86a9eb..41b16c8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
index 9fdea27..830e190 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
index 523e2b9..647c0f5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
index eb13b97..2a1014f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
index d0da850..1c99746 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
index 3259f87..bcfab3b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
index c3e4ea9..d08ab51 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
index f6a759c..1f8a02e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
index fa3499a..8f9af66 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index 7d93862..5424db9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
index 0075295..3d3105e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
index 11de05a..b1b53ac 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
index 93dc67a..150cedd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
index 6ce88ce..8bbe40c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
index 28a2ba4..7715a99 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
index 993af32..f543a57 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
index 50b27e6..0fd10f3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 9489e89..1322f53 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index 8a72062..8263606 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
index c75dce6..7427602 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
index 0cea04e..c675b33 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
index bd6d7e5..0c26eba 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
index fa01bc2..62d29a6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
index 3588cb1..5c8fcbd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index 9758535..cccb113 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
index ec6030f..3924858 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
index 7672fa3..56af97a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
index 1042b05..7f84e6a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
index dc8fdc2..329ba10 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
index 0c9dd32..766d17f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
index 9c1a73f..8474b60 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index 54c5bec..bdcc2ce 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index a86322a..9dbb909 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
index 4ba2278..6905f1c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
index bc037fa..138f831 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
index 33f6923..f8d42e1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
index 99dbcc0..78958ee 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
index 85135ca..27ef569 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
index 76b8bc9..37f28c5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
index 265c400..f2a4933 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
index 4574615..0469e24 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
index 2a00a07..3f80cf8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
index 94c3deb..61bf8c5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
index 0849ea3..8ddfa2c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index 47c2eec..283a8f1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
index 9a57e59..5bef260 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
index 9aec876..ca21189 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
index a4d20b8..e4c2c8e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
index 8df82b0..28b30d3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
index 89b4bcc..ab0eb3e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
index 213fd6e..f24e3ce 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
index 7efdbae..c0b73d1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
index dbd636e..03c5ef3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
index 5ab6a0d..b3159b5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
index 842413a..10ea2da 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
index 41b92f5..628b3e6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
index f8b5f35..bba1e5b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
index 51ff6a4..21820fa 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
index cde7ce6..0e2f088 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
index 669f02a..3e8227d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
index 365bafd..5daadbf 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
index 594de97..f0370fd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
index a885cb5..3a4940d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
index 4622c35..afd1bb6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
index 7188cf2..28d2155 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
index bc9cbd8..5c6c8db 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
index 7c92f62..0e50b28 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
index 32c8645..13c181b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
index 12173c6..9d8fb70 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
index 6e06811..4d253b1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
index 36dc1e3..104b489 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
index 996df6d..91b1c26 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index 49e38ad..99e0866 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
index eb71584..26b59f4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
index 6ec881f..e51eab3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
index 45b707a..3060a18 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
index 7eae310..0e27484 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
index 81dd47e..18719fc 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
index 9d5a91b..c60a796 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
index 7881bc5..3cc8906 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
index 56449a3..567bc89 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
index 305b85e..56f4ca5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
index 67735fa..e3b9d7a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
index aa7672e..b5bf134 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
index 15e4a2a..8dc8e7f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
index 78bb1e1..d9615cd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
index 981177c..3f4c84e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
index 857b6d9..81f1f6b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
index dddb34e..aa0ec2b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index bececb6..cdd4e2c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
index 5e3bcf8..7c60466 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
index c8b3629..5a5d1be 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
index caeb2ec..60fe5d9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
index 15c760f..c866916 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
index 7b882a2..dd71baf 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
index fb9422c..085354c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index d3d777c..2d4aa17 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
index 0e2e60c..6d881b4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
index 2b1ed7f..a9a460f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
index 0688624..4763de6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
index 77b405f..1f0b725 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
index def0b3e..315a444 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
index 3e56482..b1fd078 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
index cc506d6..814458c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
index c2bb116..f4a21ec 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
index 06dcf45..804576e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
index b0fd135..41aadc8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
index 1f1ce10..ee304f1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
index 23c5649..c76cd56 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
index c11bfe3..ae8a5d5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
index 9133378..4d8a8c4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
index 4b6aa0b..58c49b4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
index 13d9626..f80317e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
index 46181d0..0d19153 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
index 93be3b4..aa999aa 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
index 0a6dc03..5cb4c70 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
index ddbeb93..545acd6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
index 80164d3..099abad 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
index cac43d9..9ddaa6d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
index 19a6bcc..77b1c37 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
index d08e73c..1b38fad 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
index f885919..4fd5bef 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
index ac1bd52..7af1941 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
index b33e278..dd28438 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
index 2542dac..f6a9ca7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
index 7cfd32e..63c6552 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
index 2e7992d..26a0a83 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
index 057bc58..7def0b0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
index b340ff4..b0a9091 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
index 0a8fd5a..37a25cd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
index 4512db7..2f76125 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
index 7090236..ed5f1c2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
index a4fdd21..120733e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
index dc8edc1..ec0dc88 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
index e64d262..1196415 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
index cec9da0..b1d2c0b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
index ab36170..12ff2b2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
index 9cad69b..c2db122 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
index 7b82adf..6dab4fd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
index 2fbdcd8..7ab70d5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
index 64f218f..4e0a8f0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
index b940c97..feefd0b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
index 1813fab..d794458 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
index ab06258..583c0c5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
index 0042867..7b61318 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
index 46bf730..ae066ec 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
index 31f262d..839a4a6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
index bfb8634..9a777b7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
index 13b2e9e..ff54ca3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
index abfff57..14d3b76 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
index 3695f2c..51e48ad 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
index 83cf491..f674cb1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
index 5e16591..fb4de36 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
index 9bb22e0..fdb7123 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
index c901e02..78f089f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
index e961451..13fe8a6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
index 5b88b7a..2a56c46 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
index f9d3bca..4ca8ec7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
index 1aa16bb..ab4b2ad 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
index 2041eca..8053fb9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
index ec2c9fd..f150252 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
index 850ba17..98b5791 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
index ea33a67..deaa0e8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
index 08e2520..daf2bcd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
index fd3e40f..97a01cc 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
index 4683a44..58d7134 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
index aebc1cf..7039793 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
index bc6a0cc..6a92ffa 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
index 86b5c43..c6aea9b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
index 03cf2c3..49a20b3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
index 50e29a4..dbd573a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
index ee52982..510227c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
index 7f35372..c4fc13a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
index 6c8e21e..c5b01cd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
index 531a36a..05486d0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
index 392bc44..2f81756 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
index bd7b516..84888cd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
index 8c90003..776bb83 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
index 364316d..3ded7e0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
index 0a82344..8b2fc41 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
index 0c3664f..5b95e0a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
index 90f87cd..0ccb213 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
index f288a7c..0458496 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
index 9d77fc1..aca9857 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
index 5de895f..15ffc49 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
index 3b46029..6a92ce3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
index 6a3ac5b..d647760 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
index 77d9e3e..bf7eb3f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
index eb3734c..0ddedf6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
index 53ab50c..a71337b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
index c888bcb..4860822 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
index 106b9fc..d6b1c18 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
index ce332e7..d50a5a0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
index 9b5aabd..0ba762b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
index 480c607..07f849f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
index 9e0046f..1d904c2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
index ebaac11..001199f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
index 191f503..e1a6e8f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
index 05e8cf7..42355f3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
index 0217bfd..174c0e9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SS
deleted file mode 100644
index a2d700a..0000000
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SS
+++ /dev/null
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
index ea017d0..ca67d4f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
index 8a301f4..ee931b6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
index 0e4b300..174a66c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
index fd3a1fd..8e22d99 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
index f3c193b..7c24669 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
index ee5e4fd..f518998 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
index 7f3a75a..d3afe7e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
index 91563ba..0dc8de2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
index b977ac2..bb0cb82 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US
index c0b3867..28c638a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
index 6b22ead..18bbe33 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
index a91f925..dc912d7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
index b8e1de8..cdfdd92 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
Binary files differ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
index 011b07b..ab79ab8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
Binary files differ
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 0bdd8b6..09a8a40 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -638,20 +638,6 @@
assertEquals("+52 800 123 45", formatter.inputDigit('5'));
assertEquals("+52 800 123 456", formatter.inputDigit('6'));
assertEquals("+52 800 123 4567", formatter.inputDigit('7'));
-
- // +529011234567, proactively ensuring that no formatting is applied, where a format is chosen
- // that would otherwise have led to some digits being dropped.
- formatter.clear();
- assertEquals("9", formatter.inputDigit('9'));
- assertEquals("90", formatter.inputDigit('0'));
- assertEquals("901", formatter.inputDigit('1'));
- assertEquals("9011", formatter.inputDigit('1'));
- assertEquals("90112", formatter.inputDigit('2'));
- assertEquals("901123", formatter.inputDigit('3'));
- assertEquals("9011234", formatter.inputDigit('4'));
- assertEquals("90112345", formatter.inputDigit('5'));
- assertEquals("901123456", formatter.inputDigit('6'));
- assertEquals("9011234567", formatter.inputDigit('7'));
// +52 55 1234 5678
formatter.clear();
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java
index 91b2f39..f490553 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java
@@ -28,7 +28,7 @@
// We should have some data for Germany.
PhoneMetadata germanyMetadata = MetadataManager.getAlternateFormatsForCountry(49);
assertNotNull(germanyMetadata);
- assertTrue(germanyMetadata.getNumberFormatCount() > 0);
+ assertTrue(germanyMetadata.numberFormats().size() > 0);
}
public void testAlternateFormatsFailsGracefully() throws Exception {
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
index 641bd77..1b26a10 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
@@ -189,7 +189,7 @@
assertEquals(1, metadata.getCountryCode());
assertEquals("011", metadata.getInternationalPrefix());
assertTrue(metadata.hasNationalPrefix());
- assertEquals(2, metadata.getNumberFormatCount());
+ assertEquals(2, metadata.numberFormatSize());
assertEquals("(\\d{3})(\\d{3})(\\d{4})",
metadata.getNumberFormat(1).getPattern());
assertEquals("$1 $2 $3", metadata.getNumberFormat(1).getFormat());
@@ -213,8 +213,8 @@
assertEquals(49, metadata.getCountryCode());
assertEquals("00", metadata.getInternationalPrefix());
assertEquals("0", metadata.getNationalPrefix());
- assertEquals(6, metadata.getNumberFormatCount());
- assertEquals(1, metadata.getNumberFormat(5).getLeadingDigitsPatternCount());
+ assertEquals(6, metadata.numberFormatSize());
+ assertEquals(1, metadata.getNumberFormat(5).leadingDigitsPatternSize());
assertEquals("900", metadata.getNumberFormat(5).getLeadingDigitsPattern(0));
assertEquals("(\\d{3})(\\d{3,4})(\\d{4})",
metadata.getNumberFormat(5).getPattern());
@@ -653,10 +653,6 @@
// are accepted as possible international prefixes in our test metadta.)
assertEquals("0011 39 02 3661 8300",
phoneUtil.formatOutOfCountryCallingNumber(IT_NUMBER, RegionCode.AU));
-
- // Testing preferred international prefixes with ~ are supported (designates waiting).
- assertEquals("8~10 39 02 3661 8300",
- phoneUtil.formatOutOfCountryCallingNumber(IT_NUMBER, RegionCode.UZ));
}
public void testFormatOutOfCountryKeepingAlphaChars() {
@@ -904,11 +900,11 @@
}
public void testFormatByPattern() {
- NumberFormat.Builder newNumFormat = NumberFormat.newBuilder();
+ NumberFormat newNumFormat = new NumberFormat();
newNumFormat.setPattern("(\\d{3})(\\d{3})(\\d{4})");
newNumFormat.setFormat("($1) $2-$3");
List<NumberFormat> newNumberFormats = new ArrayList<NumberFormat>();
- newNumberFormats.add(newNumFormat.build());
+ newNumberFormats.add(newNumFormat);
assertEquals("(650) 253-0000", phoneUtil.formatByPattern(US_NUMBER, PhoneNumberFormat.NATIONAL,
newNumberFormats));
@@ -923,7 +919,6 @@
// followed.
newNumFormat.setNationalPrefixFormattingRule("$NP ($FG)");
newNumFormat.setFormat("$1 $2-$3");
- newNumberFormats.set(0, newNumFormat.build());
assertEquals("1 (242) 365-1234",
phoneUtil.formatByPattern(BS_NUMBER, PhoneNumberFormat.NATIONAL,
newNumberFormats));
@@ -933,7 +928,7 @@
newNumFormat.setPattern("(\\d{2})(\\d{5})(\\d{3})");
newNumFormat.setFormat("$1-$2 $3");
- newNumberFormats.set(0, newNumFormat.build());
+ newNumberFormats.set(0, newNumFormat);
assertEquals("02-36618 300",
phoneUtil.formatByPattern(IT_NUMBER, PhoneNumberFormat.NATIONAL,
@@ -945,19 +940,17 @@
newNumFormat.setNationalPrefixFormattingRule("$NP$FG");
newNumFormat.setPattern("(\\d{2})(\\d{4})(\\d{4})");
newNumFormat.setFormat("$1 $2 $3");
- newNumberFormats.set(0, newNumFormat.build());
+ newNumberFormats.set(0, newNumFormat);
assertEquals("020 7031 3000",
phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL,
newNumberFormats));
newNumFormat.setNationalPrefixFormattingRule("($NP$FG)");
- newNumberFormats.set(0, newNumFormat.build());
assertEquals("(020) 7031 3000",
phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL,
newNumberFormats));
newNumFormat.setNationalPrefixFormattingRule("");
- newNumberFormats.set(0, newNumFormat.build());
assertEquals("20 7031 3000",
phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL,
newNumberFormats));
@@ -1821,32 +1814,29 @@
}
public void testMaybeStripNationalPrefix() {
- PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder();
- metadata.setId("ignored");
+ PhoneMetadata metadata = new PhoneMetadata();
metadata.setNationalPrefixForParsing("34");
- metadata
- .getGeneralDescBuilder()
- .setNationalNumberPattern("\\d{4,8}");
+ metadata.setGeneralDesc(new PhoneNumberDesc().setNationalNumberPattern("\\d{4,8}"));
StringBuilder numberToStrip = new StringBuilder("34356778");
String strippedNumber = "356778";
- assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
+ assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
assertEquals("Should have had national prefix stripped.",
strippedNumber, numberToStrip.toString());
// Retry stripping - now the number should not start with the national prefix, so no more
// stripping should occur.
- assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
+ assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
assertEquals("Should have had no change - no national prefix present.",
strippedNumber, numberToStrip.toString());
// Some countries have no national prefix. Repeat test with none specified.
metadata.setNationalPrefixForParsing("");
- assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
+ assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
assertEquals("Should not strip anything with empty national prefix.",
strippedNumber, numberToStrip.toString());
// If the resultant number doesn't match the national rule, it shouldn't be stripped.
metadata.setNationalPrefixForParsing("3");
numberToStrip = new StringBuilder("3123");
strippedNumber = "3123";
- assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
+ assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
assertEquals("Should have had no change - after stripping, it wouldn't have matched "
+ "the national rule.",
strippedNumber, numberToStrip.toString());
@@ -1855,9 +1845,8 @@
numberToStrip = new StringBuilder("08122123456");
strippedNumber = "22123456";
StringBuilder carrierCode = new StringBuilder();
- assertTrue(
- phoneUtil.maybeStripNationalPrefixAndCarrierCode(
- numberToStrip, metadata.build(), carrierCode));
+ assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(
+ numberToStrip, metadata, carrierCode));
assertEquals("81", carrierCode.toString());
assertEquals("Should have had national prefix and carrier code stripped.",
strippedNumber, numberToStrip.toString());
@@ -1867,8 +1856,7 @@
metadata.setNationalPrefixForParsing("0(\\d{2})");
numberToStrip = new StringBuilder("031123");
String transformedNumber = "5315123";
- assertTrue(
- phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
+ assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
assertEquals("Should transform the 031 to a 5315.",
transformedNumber, numberToStrip.toString());
}
@@ -2681,137 +2669,6 @@
// Retry with the same number in a slightly different format.
assertEquals(usWithExtension, phoneUtil.parse("+1 (645) 123 1234 ext. 910#", RegionCode.US));
}
-
- public void testParseHandlesLongExtensionsWithExplicitLabels() throws Exception {
- // Test lower and upper limits of extension lengths for each type of label.
- PhoneNumber nzNumber = new PhoneNumber();
- nzNumber.setCountryCode(64).setNationalNumber(33316005L);
-
- // Firstly, when in RFC format: PhoneNumberUtil.extLimitAfterExplicitLabel
- nzNumber.setExtension("0");
- assertEquals(nzNumber, phoneUtil.parse("tel:+6433316005;ext=0", RegionCode.NZ));
- nzNumber.setExtension("01234567890123456789");
- assertEquals(
- nzNumber, phoneUtil.parse("tel:+6433316005;ext=01234567890123456789", RegionCode.NZ));
- // Extension too long.
- try {
- phoneUtil.parse("tel:+6433316005;ext=012345678901234567890", RegionCode.NZ);
- fail(
- "This should not parse as length of extension is higher than allowed: "
- + "tel:+6433316005;ext=012345678901234567890");
- } catch (NumberParseException e) {
- // Expected this exception.
- assertEquals(
- "Wrong error type stored in exception.",
- NumberParseException.ErrorType.NOT_A_NUMBER,
- e.getErrorType());
- }
-
- // Explicit extension label: PhoneNumberUtil.extLimitAfterExplicitLabel
- nzNumber.setExtension("1");
- assertEquals(nzNumber, phoneUtil.parse("03 3316005ext:1", RegionCode.NZ));
- nzNumber.setExtension("12345678901234567890");
- assertEquals(nzNumber, phoneUtil.parse("03 3316005 xtn:12345678901234567890", RegionCode.NZ));
- assertEquals(
- nzNumber, phoneUtil.parse("03 3316005 extension\t12345678901234567890", RegionCode.NZ));
- assertEquals(
- nzNumber, phoneUtil.parse("03 3316005 xtensio:12345678901234567890", RegionCode.NZ));
- assertEquals(
- nzNumber, phoneUtil.parse("03 3316005 xtensi\u00F3n, 12345678901234567890#", RegionCode.NZ));
- assertEquals(
- nzNumber, phoneUtil.parse("03 3316005extension.12345678901234567890", RegionCode.NZ));
- assertEquals(nzNumber, phoneUtil.parse("03 3316005 \u0434\u043E\u0431:12345678901234567890", RegionCode.NZ));
- // Extension too long.
- try {
- phoneUtil.parse("03 3316005 extension 123456789012345678901", RegionCode.NZ);
- fail(
- "This should not parse as length of extension is higher than allowed: "
- + "03 3316005 extension 123456789012345678901");
- } catch (NumberParseException e) {
- // Expected this exception.
- assertEquals(
- "Wrong error type stored in exception.",
- NumberParseException.ErrorType.TOO_LONG,
- e.getErrorType());
- }
- }
-
- public void testParseHandlesLongExtensionsWithAutoDiallingLabels() throws Exception {
- // Secondly, cases of auto-dialling and other standard extension labels,
- // PhoneNumberUtil.extLimitAfterLikelyLabel
- PhoneNumber usNumberUserInput = new PhoneNumber();
- usNumberUserInput.setCountryCode(1).setNationalNumber(2679000000L);
- usNumberUserInput.setExtension("123456789012345");
- assertEquals(
- usNumberUserInput, phoneUtil.parse("+12679000000,,123456789012345#", RegionCode.US));
- assertEquals(
- usNumberUserInput, phoneUtil.parse("+12679000000;123456789012345#", RegionCode.US));
- PhoneNumber ukNumberUserInput = new PhoneNumber();
- ukNumberUserInput.setCountryCode(44).setNationalNumber(2034000000L).setExtension("123456789");
- assertEquals(ukNumberUserInput, phoneUtil.parse("+442034000000,,123456789#", RegionCode.GB));
- // Extension too long.
- try {
- phoneUtil.parse("+12679000000,,1234567890123456#", RegionCode.US);
- fail(
- "This should not parse as length of extension is higher than allowed: "
- + "+12679000000,,1234567890123456#");
- } catch (NumberParseException e) {
- // Expected this exception.
- assertEquals(
- "Wrong error type stored in exception.",
- NumberParseException.ErrorType.NOT_A_NUMBER,
- e.getErrorType());
- }
- }
-
- public void testParseHandlesShortExtensionsWithAmbiguousChar() throws Exception {
- PhoneNumber nzNumber = new PhoneNumber();
- nzNumber.setCountryCode(64).setNationalNumber(33316005L);
-
- // Thirdly, for single and non-standard cases:
- // PhoneNumberUtil.extLimitAfterAmbiguousChar
- nzNumber.setExtension("123456789");
- assertEquals(nzNumber, phoneUtil.parse("03 3316005 x 123456789", RegionCode.NZ));
- assertEquals(nzNumber, phoneUtil.parse("03 3316005 x. 123456789", RegionCode.NZ));
- assertEquals(nzNumber, phoneUtil.parse("03 3316005 #123456789#", RegionCode.NZ));
- assertEquals(nzNumber, phoneUtil.parse("03 3316005 ~ 123456789", RegionCode.NZ));
- // Extension too long.
- try {
- phoneUtil.parse("03 3316005 ~ 1234567890", RegionCode.NZ);
- fail(
- "This should not parse as length of extension is higher than allowed: "
- + "03 3316005 ~ 1234567890");
- } catch (NumberParseException e) {
- // Expected this exception.
- assertEquals(
- "Wrong error type stored in exception.",
- NumberParseException.ErrorType.TOO_LONG,
- e.getErrorType());
- }
- }
-
- public void testParseHandlesShortExtensionsWhenNotSureOfLabel() throws Exception {
- // Lastly, when no explicit extension label present, but denoted by tailing #:
- // PhoneNumberUtil.extLimitWhenNotSure
- PhoneNumber usNumber = new PhoneNumber();
- usNumber.setCountryCode(1).setNationalNumber(1234567890L).setExtension("666666");
- assertEquals(usNumber, phoneUtil.parse("+1123-456-7890 666666#", RegionCode.US));
- usNumber.setExtension("6");
- assertEquals(usNumber, phoneUtil.parse("+11234567890-6#", RegionCode.US));
- // Extension too long.
- try {
- phoneUtil.parse("+1123-456-7890 7777777#", RegionCode.US);
- fail(
- "This should not parse as length of extension is higher than allowed: "
- + "+1123-456-7890 7777777#");
- } catch (NumberParseException e) {
- // Expected this exception.
- assertEquals(
- "Wrong error type stored in exception.",
- NumberParseException.ErrorType.NOT_A_NUMBER,
- e.getErrorType());
- }
- }
public void testParseAndKeepRaw() throws Exception {
PhoneNumber alphaNumericNumber = new PhoneNumber().mergeFrom(ALPHA_NUMERIC_NUMBER).
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
index fa8d8c4..74f5f2a 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
Binary files differ
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/internal/MatcherTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/internal/MatcherTest.java
index 0470eb8..822f40d 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/internal/MatcherTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/internal/MatcherTest.java
@@ -29,7 +29,9 @@
}
private void checkMatcherBehavesAsExpected(MatcherApi matcher) {
- PhoneNumberDesc desc = createDesc("");
+ PhoneNumberDesc desc = new PhoneNumberDesc();
+
+ desc = createDesc("");
// Test if there is no matcher data.
assertInvalid(matcher, "1", desc);
@@ -58,11 +60,11 @@
// Helper method to set national number fields in the PhoneNumberDesc proto. Empty fields won't be
// set.
private PhoneNumberDesc createDesc(String nationalNumberPattern) {
- PhoneNumberDesc.Builder desc = PhoneNumberDesc.newBuilder();
+ PhoneNumberDesc desc = new PhoneNumberDesc();
if (nationalNumberPattern.length() > 0) {
desc.setNationalNumberPattern(nationalNumberPattern);
}
- return desc.build();
+ return desc;
}
private void assertMatched(MatcherApi matcher, String number, PhoneNumberDesc desc) {
diff --git a/pom.xml b/pom.xml
index 97b8cc5..d5f4fe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
- <version>8.12.46</version>
+ <version>8.10.21</version>
<packaging>pom</packaging>
<url>https://github.com/google/libphonenumber/</url>
@@ -34,7 +34,7 @@
<connection>scm:git:https://github.com/google/libphonenumber.git</connection>
<developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git</developerConnection>
<url>https://github.com/google/libphonenumber/</url>
- <tag>v8.12.46</tag>
+ <tag>v8.10.21</tag>
</scm>
<properties>
@@ -161,8 +161,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.6</source>
+ <target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -232,7 +232,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1242_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1242_en
index f029b46..e3f0c0b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1242_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1242_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1326_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1326_en
deleted file mode 100644
index a9ac6ec..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1326_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1340_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1340_en
deleted file mode 100644
index 04c9397..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1340_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1345_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1345_en
index bd11fc2..cc5f70e 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1345_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1345_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1367_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1367_en
deleted file mode 100644
index 7c1b37e..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1367_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1368_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1368_en
deleted file mode 100644
index 7107ece..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1368_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1441_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1441_en
new file mode 100644
index 0000000..024ff72
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1441_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1447_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1447_en
deleted file mode 100644
index 6924dec..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1447_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1448_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1448_en
deleted file mode 100644
index 352dd5e..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1448_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1464_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1464_en
deleted file mode 100644
index 435c6f7..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1464_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1474_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1474_en
deleted file mode 100644
index 6f08106..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1474_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1572_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1572_en
deleted file mode 100644
index 0f8e15b..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1572_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1582_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1582_en
deleted file mode 100644
index 7d5f7c5..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1582_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1659_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1659_en
deleted file mode 100644
index 0c78c72..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1659_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1672_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1672_en
deleted file mode 100644
index 6d2e060..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1672_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1771_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1771_en
deleted file mode 100644
index 8cc22d5..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1771_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1839_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1839_en
deleted file mode 100644
index 32e5f3e..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1839_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1840_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1840_en
deleted file mode 100644
index a9faf2a..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1840_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1854_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1854_en
index 42c43eb..4440fe7 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1854_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1854_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1867_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1867_en
index d5c0c4a..05fbabf 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1867_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1867_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1945_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1945_en
deleted file mode 100644
index 523a8aa..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1945_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
index 2ae8176..b89c9e0 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
index 9016b0d..f6b1176 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/213_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/213_en
index 9bdb587..7a1379c 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/213_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/213_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/216_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/216_en
index 10e20d1..9af2d13 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/216_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/216_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/218_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/218_en
index b6ec690..8c81542 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/218_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/218_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/220_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/220_en
index 81be19a..6ef28be 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/220_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/220_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/221_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/221_en
index 1936bb2..87a8cc1 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/221_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/221_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/224_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/224_en
index c0340bf..94734b8 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/224_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/224_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/225_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/225_en
index 47e1916..747091b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/225_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/225_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/233_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/233_en
index 5bafef1..416e875 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/233_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/233_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/234_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/234_en
index ef8dd43..da1af17 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/234_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/234_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/236_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/236_en
deleted file mode 100644
index 314832a..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/236_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/238_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/238_en
index 6367de8..092d85a 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/238_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/238_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/241_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/241_en
index 64095f9..0848427 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/241_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/241_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en
index f2b6c5a..007eb7c 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/252_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/252_en
index 7b8224f..7b2d9fc 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/252_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/252_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/264_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/264_en
index 9826d45..8043293 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/264_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/264_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/267_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/267_en
index 066ad25..0a06611 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/267_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/267_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_en
index 21fffa1..6aea638 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_fr b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_fr
index 06afe7f..1f877a6 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_fr
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_fr
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en
index c94e139..e7f6f16 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
index eb983e1..e6424bb 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
index 4e81c8a..77a25fc 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
index 3ab2985..652bfda 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_de b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_de
index e0bdb81..4c80c16 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_de
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_de
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_en
index 26e14b4..ad888cc 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/353_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/353_en
index d9fdcd0..b207f52 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/353_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/353_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/354_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/354_en
index 15b7906..2e85aa2 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/354_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/354_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/370_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/370_en
index b49d48c..f2fffb5 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/370_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/370_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_en
index 658550c..eeee7e4 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_hy b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_hy
index d2333d4..1d11627 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_hy
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_hy
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_ru b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_ru
index 7d52318..9f0226f 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_ru
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_ru
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/380_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/380_en
index 32b5f39..4626068 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/380_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/380_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/386_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/386_en
deleted file mode 100644
index 115cf8f..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/386_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/389_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/389_en
index 2d83434..e3b6913 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/389_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/389_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/421_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/421_en
index e513c68..5a5dc09 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/421_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/421_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/43_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/43_en
index 14c8da3..40fd28d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/43_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/43_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en
index b40793e..3e19613 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_en
index 35bada2..0e30c33 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_sv b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_sv
new file mode 100644
index 0000000..31a27a8
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_sv
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/47_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/47_en
index 828e127..91d9f47 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/47_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/47_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_de b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_de
index ae26ed3..428b8bf 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_de
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_de
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_en
index 0c7aaae..11f59e4 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en
index d9487c9..d8eabc4 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en
index e51cd55..c8e25d4 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_es
index 7fc1659..7f5de7c 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_es
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
index 5324582..77d1fee 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/55_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/55_en
index ce16598..3955d71 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/55_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/55_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_en
index f0e057e..a6724ae 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_es
index 45107ee..b453a4e 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_es
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en
index ec254fa..347d96b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_en
index 54ba222..2bf005e 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_es
index 4def98a..5e85d0c 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_es
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/593_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/593_en
deleted file mode 100644
index 551bd93..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/593_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/595_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/595_en
deleted file mode 100644
index e6307d4..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/595_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/598_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/598_en
deleted file mode 100644
index 3d486db..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/598_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/599_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/599_en
index 4db9fde..54bef5f 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/599_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/599_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/60_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/60_en
index 3b71403..1e21374 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/60_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/60_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en
index e56bfb9..123a41c 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/63_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/63_en
deleted file mode 100644
index a7d08a1..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/63_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/64_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/64_en
index 835a1aa..8e56425 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/64_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/64_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_en
index 4a5546c..cb2807d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_th b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_th
index d68b623..5e86e0b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_th
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_th
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/670_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/670_en
deleted file mode 100644
index 2483baa..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/670_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/672_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/672_en
deleted file mode 100644
index 4f75473..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/672_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/673_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/673_en
deleted file mode 100644
index 1c6166b..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/673_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/678_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/678_en
deleted file mode 100644
index 96bb067..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/678_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/679_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/679_en
deleted file mode 100644
index 698326f..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/679_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/680_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/680_en
index 3a4b011..64d9cd4 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/680_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/680_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/682_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/682_en
deleted file mode 100644
index 8efd06d..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/682_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/685_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/685_en
deleted file mode 100644
index f437acd..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/685_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en
index 32876c4..1697bec 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/689_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/689_en
deleted file mode 100644
index 95e8315..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/689_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/690_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/690_en
deleted file mode 100644
index e0aea52..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/690_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_en
index efc7c54..19e0566 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_ru b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_ru
index afce4a6..7ac8a63 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_ru
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_ru
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_en
index d5d7ac5..8adf529 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_ja b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_ja
index d301aa0..2153b5a 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_ja
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_ja
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/850_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/850_en
deleted file mode 100644
index dd382d0..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/850_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/880_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/880_en
index 14db15a..febe191 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/880_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/880_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_en
index fdaa487..ef765f5 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_zh b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_zh
index 923fe0a..e250685 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_zh
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_zh
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/91_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/91_en
index 4800528..3ab469b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/91_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/91_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/92_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/92_en
deleted file mode 100644
index 8561f83..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/92_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/94_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/94_en
index 886e42a..7fab12a 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/94_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/94_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/961_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/961_en
deleted file mode 100644
index fde8990..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/961_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/962_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/962_en
index c4d61bc..37a2bf8 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/962_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/962_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/963_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/963_en
deleted file mode 100644
index 065e356..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/963_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/967_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/967_en
deleted file mode 100644
index 3d2ffc8..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/967_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/970_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/970_en
deleted file mode 100644
index 43a8e95..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/970_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/971_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/971_en
deleted file mode 100644
index 48273fa..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/971_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/993_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/993_en
deleted file mode 100644
index cd0e4cf..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/993_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/994_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/994_en
index b3eadf7..69468e9 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/994_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/994_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/995_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/995_en
deleted file mode 100644
index 89b3600..0000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/995_en
+++ /dev/null
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/996_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/996_en
index 16d44e6..46b794d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/996_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/996_en
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config
index 4965989..7c428d0 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config
Binary files differ
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data b/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
index a2c80e6..330087d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
index cca8a0b..5432f67 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
@@ -30,9 +30,9 @@
public class AlternateFormatsCountryCodeSet {
// A set of all country codes for which data is available.
static Set<Integer> getCountryCodeSet() {
- // The capacity is set to 61 as there are 46 different entries,
+ // The capacity is set to 62 as there are 47 different entries,
// and this offers a load factor of roughly 0.75.
- Set<Integer> countryCodeSet = new HashSet<Integer>(61);
+ Set<Integer> countryCodeSet = new HashSet<Integer>(62);
countryCodeSet.add(7);
countryCodeSet.add(27);
@@ -50,6 +50,7 @@
countryCodeSet.add(58);
countryCodeSet.add(61);
countryCodeSet.add(62);
+ countryCodeSet.add(63);
countryCodeSet.add(64);
countryCodeSet.add(66);
countryCodeSet.add(81);
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java
index f41f7e1..68744b5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -64,7 +64,7 @@
// code, from the national number.
private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' ';
private static final PhoneMetadata EMPTY_METADATA =
- PhoneMetadata.newBuilder().setId("<ignored>").setInternationalPrefix("NA").build();
+ new PhoneMetadata().setInternationalPrefix("NA");
private PhoneMetadata defaultMetadata;
private PhoneMetadata currentMetadata;
@@ -72,12 +72,10 @@
// used by the AYTF. It is eligible when the format element under numberFormat contains groups of
// the dollar sign followed by a single digit, separated by valid phone number punctuation. This
// prevents invalid punctuation (such as the star sign in Israeli star numbers) getting into the
- // output of the AYTF. We require that the first group is present in the output pattern to ensure
- // no data is lost while formatting; when we format as you type, this should always be the case.
+ // output of the AYTF.
private static final Pattern ELIGIBLE_FORMAT_PATTERN =
Pattern.compile("[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*"
- + "\\$1" + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*(\\$\\d"
- + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*)*");
+ + "(\\$\\d" + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*)+");
// A set of characters that, if found in a national prefix formatting rules, are an indicator to
// us that we should separate the national prefix from the number when formatting.
private static final Pattern NATIONAL_PREFIX_SEPARATORS_PATTERN = Pattern.compile("[- ]");
@@ -170,9 +168,9 @@
// First decide whether we should use international or national number rules.
boolean isInternationalNumber = isCompleteNumber && extractedNationalPrefix.length() == 0;
List<NumberFormat> formatList =
- (isInternationalNumber && currentMetadata.getIntlNumberFormatCount() > 0)
- ? currentMetadata.getIntlNumberFormatList()
- : currentMetadata.getNumberFormatList();
+ (isInternationalNumber && currentMetadata.intlNumberFormatSize() > 0)
+ ? currentMetadata.intlNumberFormats()
+ : currentMetadata.numberFormats();
for (NumberFormat format : formatList) {
// Discard a few formats that we know are not relevant based on the presence of the national
// prefix.
@@ -207,12 +205,12 @@
Iterator<NumberFormat> it = possibleFormats.iterator();
while (it.hasNext()) {
NumberFormat format = it.next();
- if (format.getLeadingDigitsPatternCount() == 0) {
+ if (format.leadingDigitsPatternSize() == 0) {
// Keep everything that isn't restricted by leading digits.
continue;
}
int lastLeadingDigitsPattern =
- Math.min(indexOfLeadingDigitsPattern, format.getLeadingDigitsPatternCount() - 1);
+ Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1);
Pattern leadingDigitsPattern = regexCache.getPatternForRegex(
format.getLeadingDigitsPattern(lastLeadingDigitsPattern));
Matcher m = leadingDigitsPattern.matcher(leadingDigits);
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
index 2e2d96a..1d48481 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
@@ -579,8 +579,8 @@
MetadataManager.getAlternateFormatsForCountry(number.getCountryCode());
String nationalSignificantNumber = util.getNationalSignificantNumber(number);
if (alternateFormats != null) {
- for (NumberFormat alternateFormat : alternateFormats.getNumberFormatList()) {
- if (alternateFormat.getLeadingDigitsPatternCount() > 0) {
+ for (NumberFormat alternateFormat : alternateFormats.numberFormats()) {
+ if (alternateFormat.leadingDigitsPatternSize() > 0) {
// There is only one leading digits pattern for alternate formats.
Pattern pattern =
regexCache.getPatternForRegex(alternateFormat.getLeadingDigitsPattern(0));
@@ -668,7 +668,7 @@
// Check if a national prefix should be present when formatting this number.
String nationalNumber = util.getNationalSignificantNumber(number);
NumberFormat formatRule =
- util.chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
+ util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
// To do this, we check that a national prefix formatting rule was present and that it wasn't
// just the first-group symbol ($1) with punctuation.
if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) {
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index 95e4c4e..a49914a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -305,98 +305,46 @@
// as the default extension prefix. This can be overridden by region-specific preferences.
private static final String DEFAULT_EXTN_PREFIX = " ext. ";
+ // Pattern to capture digits used in an extension. Places a maximum length of "7" for an
+ // extension.
+ private static final String CAPTURING_EXTN_DIGITS = "(" + DIGITS + "{1,7})";
// Regexp of all possible ways to write extensions, for use when parsing. This will be run as a
// case-insensitive regexp match. Wide character versions are also provided after each ASCII
// version.
- private static final String EXTN_PATTERNS_FOR_PARSING = createExtnPattern(true);
- static final String EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(false);
-
- /**
- * Helper method for constructing regular expressions for parsing. Creates an expression that
- * captures up to maxLength digits.
- */
- private static String extnDigits(int maxLength) {
- return "(" + DIGITS + "{1," + maxLength + "})";
+ private static final String EXTN_PATTERNS_FOR_PARSING;
+ static final String EXTN_PATTERNS_FOR_MATCHING;
+ static {
+ // One-character symbols that can be used to indicate an extension.
+ String singleExtnSymbolsForMatching = "x\uFF58#\uFF03~\uFF5E";
+ // For parsing, we are slightly more lenient in our interpretation than for matching. Here we
+ // allow "comma" and "semicolon" as possible extension indicators. When matching, these are
+ // hardly ever used to indicate this.
+ String singleExtnSymbolsForParsing = ",;" + singleExtnSymbolsForMatching;
+
+ EXTN_PATTERNS_FOR_PARSING = createExtnPattern(singleExtnSymbolsForParsing);
+ EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(singleExtnSymbolsForMatching);
}
/**
- * Helper initialiser method to create the regular-expression pattern to match extensions.
- * Note that there are currently six capturing groups for the extension itself. If this number is
- * changed, MaybeStripExtension needs to be updated.
+ * Helper initialiser method to create the regular-expression pattern to match extensions,
+ * allowing the one-char extension symbols provided by {@code singleExtnSymbols}.
*/
- private static String createExtnPattern(boolean forParsing) {
- // We cap the maximum length of an extension based on the ambiguity of the way the extension is
- // prefixed. As per ITU, the officially allowed length for extensions is actually 40, but we
- // don't support this since we haven't seen real examples and this introduces many false
- // interpretations as the extension labels are not standardized.
- int extLimitAfterExplicitLabel = 20;
- int extLimitAfterLikelyLabel = 15;
- int extLimitAfterAmbiguousChar = 9;
- int extLimitWhenNotSure = 6;
-
- String possibleSeparatorsBetweenNumberAndExtLabel = "[ \u00A0\\t,]*";
- // Optional full stop (.) or colon, followed by zero or more spaces/tabs/commas.
- String possibleCharsAfterExtLabel = "[:\\.\uFF0E]?[ \u00A0\\t,-]*";
- String optionalExtnSuffix = "#?";
-
- // Here the extension is called out in more explicit way, i.e mentioning it obvious patterns
- // like "ext.". Canonical-equivalence doesn't seem to be an option with Android java, so we
- // allow two options for representing the accented o - the character itself, and one in the
- // unicode decomposed form with the combining acute accent.
- String explicitExtLabels =
- "(?:e?xt(?:ensi(?:o\u0301?|\u00F3))?n?|\uFF45?\uFF58\uFF54\uFF4E?|\u0434\u043E\u0431|anexo)";
- // One-character symbols that can be used to indicate an extension, and less commonly used
- // or more ambiguous extension labels.
- String ambiguousExtLabels = "(?:[x\uFF58#\uFF03~\uFF5E]|int|\uFF49\uFF4E\uFF54)";
- // When extension is not separated clearly.
- String ambiguousSeparator = "[- ]+";
-
- String rfcExtn = RFC3966_EXTN_PREFIX + extnDigits(extLimitAfterExplicitLabel);
- String explicitExtn = possibleSeparatorsBetweenNumberAndExtLabel + explicitExtLabels
- + possibleCharsAfterExtLabel + extnDigits(extLimitAfterExplicitLabel)
- + optionalExtnSuffix;
- String ambiguousExtn = possibleSeparatorsBetweenNumberAndExtLabel + ambiguousExtLabels
- + possibleCharsAfterExtLabel + extnDigits(extLimitAfterAmbiguousChar) + optionalExtnSuffix;
- String americanStyleExtnWithSuffix = ambiguousSeparator + extnDigits(extLimitWhenNotSure) + "#";
-
- // The first regular expression covers RFC 3966 format, where the extension is added using
- // ";ext=". The second more generic where extension is mentioned with explicit labels like
- // "ext:". In both the above cases we allow more numbers in extension than any other extension
- // labels. The third one captures when single character extension labels or less commonly used
- // labels are used. In such cases we capture fewer extension digits in order to reduce the
- // chance of falsely interpreting two numbers beside each other as a number + extension. The
- // fourth one covers the special case of American numbers where the extension is written with a
- // hash at the end, such as "- 503#".
- String extensionPattern =
- rfcExtn + "|"
- + explicitExtn + "|"
- + ambiguousExtn + "|"
- + americanStyleExtnWithSuffix;
- // Additional pattern that is supported when parsing extensions, not when matching.
- if (forParsing) {
- // This is same as possibleSeparatorsBetweenNumberAndExtLabel, but not matching comma as
- // extension label may have it.
- String possibleSeparatorsNumberExtLabelNoComma = "[ \u00A0\\t]*";
- // ",," is commonly used for auto dialling the extension when connected. First comma is matched
- // through possibleSeparatorsBetweenNumberAndExtLabel, so we do not repeat it here. Semi-colon
- // works in Iphone and Android also to pop up a button with the extension number following.
- String autoDiallingAndExtLabelsFound = "(?:,{2}|;)";
-
- String autoDiallingExtn = possibleSeparatorsNumberExtLabelNoComma
- + autoDiallingAndExtLabelsFound + possibleCharsAfterExtLabel
- + extnDigits(extLimitAfterLikelyLabel) + optionalExtnSuffix;
- String onlyCommasExtn = possibleSeparatorsNumberExtLabelNoComma
- + "(?:,)+" + possibleCharsAfterExtLabel + extnDigits(extLimitAfterAmbiguousChar)
- + optionalExtnSuffix;
- // Here the first pattern is exclusively for extension autodialling formats which are used
- // when dialling and in this case we accept longer extensions. However, the second pattern
- // is more liberal on the number of commas that acts as extension labels, so we have a strict
- // cap on the number of digits in such extensions.
- return extensionPattern + "|"
- + autoDiallingExtn + "|"
- + onlyCommasExtn;
- }
- return extensionPattern;
+ private static String createExtnPattern(String singleExtnSymbols) {
+ // There are three regular expressions here. The first covers RFC 3966 format, where the
+ // extension is added using ";ext=". The second more generic one starts with optional white
+ // space and ends with an optional full stop (.), followed by zero or more spaces/tabs/commas
+ // and then the numbers themselves. The other one covers the special case of American numbers
+ // where the extension is written with a hash at the end, such as "- 503#"
+ // Note that the only capturing groups should be around the digits that you want to capture as
+ // part of the extension, or else parsing will fail!
+ // Canonical-equivalence doesn't seem to be an option with Android java, so we allow two options
+ // for representing the accented o - the character itself, and one in the unicode decomposed
+ // form with the combining acute accent.
+ return (RFC3966_EXTN_PREFIX + CAPTURING_EXTN_DIGITS + "|" + "[ \u00A0\\t,]*"
+ + "(?:e?xt(?:ensi(?:o\u0301?|\u00F3))?n?|\uFF45?\uFF58\uFF54\uFF4E?|"
+ + "\u0434\u043E\u0431|" + "[" + singleExtnSymbols + "]|int|anexo|\uFF49\uFF4E\uFF54)"
+ + "[:\\.\uFF0E]?[ \u00A0\\t,-]*" + CAPTURING_EXTN_DIGITS + "#?|"
+ + "[- ]+(" + DIGITS + "{1,5})#");
}
// Regexp of all known extension prefixes used by different regions followed by 1 or more valid
@@ -1393,7 +1341,7 @@
}
}
formattedNumber.append(
- formatNsnUsingPattern(nationalSignificantNumber, numFormatCopy.build(), numberFormat));
+ formatNsnUsingPattern(nationalSignificantNumber, numFormatCopy, numberFormat));
}
maybeAppendFormattedExtension(number, metadata, numberFormat, formattedNumber);
prefixNumberWithCountryCallingCode(countryCallingCode, numberFormat, formattedNumber);
@@ -1611,15 +1559,14 @@
PhoneMetadata metadataForRegionCallingFrom = getMetadataForRegion(regionCallingFrom);
String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix();
- // In general, if there is a preferred international prefix, use that. Otherwise, for regions
- // that have multiple international prefixes, the international format of the number is
- // returned since we would not know which one to use.
+ // For regions that have multiple international prefixes, the international format of the
+ // number is returned, unless there is a preferred international prefix.
String internationalPrefixForFormatting = "";
- if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) {
+ if (SINGLE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) {
+ internationalPrefixForFormatting = internationalPrefix;
+ } else if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) {
internationalPrefixForFormatting =
metadataForRegionCallingFrom.getPreferredInternationalPrefix();
- } else if (SINGLE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) {
- internationalPrefixForFormatting = internationalPrefix;
}
String regionCode = getRegionCodeForCountryCode(countryCallingCode);
@@ -1704,7 +1651,7 @@
PhoneMetadata metadata = getMetadataForRegion(regionCode);
String nationalNumber = getNationalSignificantNumber(number);
NumberFormat formatRule =
- chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
+ chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
// The format rule could still be null here if the national number was 0 and there was no
// raw input (this should not be possible for numbers generated by the phonenumber library
// as they would also not have a country calling code and we would have exited earlier).
@@ -1736,7 +1683,7 @@
numFormatCopy.mergeFrom(formatRule);
numFormatCopy.clearNationalPrefixFormattingRule();
List<NumberFormat> numberFormats = new ArrayList<NumberFormat>(1);
- numberFormats.add(numFormatCopy.build());
+ numberFormats.add(numFormatCopy);
formattedNumber = formatByPattern(number, PhoneNumberFormat.NATIONAL, numberFormats);
break;
}
@@ -1783,7 +1730,7 @@
}
String nationalNumber = getNationalSignificantNumber(number);
NumberFormat formatRule =
- chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
+ chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
return formatRule != null;
}
@@ -1847,7 +1794,7 @@
} else if (metadataForRegionCallingFrom != null
&& countryCode == getCountryCodeForValidRegion(regionCallingFrom)) {
NumberFormat formattingPattern =
- chooseFormattingPatternForNumber(metadataForRegionCallingFrom.getNumberFormatList(),
+ chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormats(),
nationalNumber);
if (formattingPattern == null) {
// If no pattern above is matched, we format the original input.
@@ -1864,7 +1811,7 @@
// This will not work in the cases where the pattern (and not the leading digits) decide
// whether a national prefix needs to be used, since we have overridden the pattern to match
// anything, but that is not the case in the metadata to date.
- return formatNsnUsingPattern(rawInput, newFormat.build(), PhoneNumberFormat.NATIONAL);
+ return formatNsnUsingPattern(rawInput, newFormat, PhoneNumberFormat.NATIONAL);
}
String internationalPrefixForFormatting = "";
// If an unsupported region-calling-from is entered, or a country with multiple international
@@ -1958,13 +1905,13 @@
PhoneMetadata metadata,
PhoneNumberFormat numberFormat,
CharSequence carrierCode) {
- List<NumberFormat> intlNumberFormats = metadata.getIntlNumberFormatList();
+ List<NumberFormat> intlNumberFormats = metadata.intlNumberFormats();
// When the intlNumberFormats exists, we use that to format national number for the
// INTERNATIONAL format instead of using the numberDesc.numberFormats.
List<NumberFormat> availableFormats =
(intlNumberFormats.size() == 0 || numberFormat == PhoneNumberFormat.NATIONAL)
- ? metadata.getNumberFormatList()
- : metadata.getIntlNumberFormatList();
+ ? metadata.numberFormats()
+ : metadata.intlNumberFormats();
NumberFormat formattingPattern = chooseFormattingPatternForNumber(availableFormats, number);
return (formattingPattern == null)
? number
@@ -1974,7 +1921,7 @@
NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats,
String nationalNumber) {
for (NumberFormat numFormat : availableFormats) {
- int size = numFormat.getLeadingDigitsPatternCount();
+ int size = numFormat.leadingDigitsPatternSize();
if (size == 0 || regexCache.getPatternForRegex(
// We always use the last leading_digits_pattern, as it is the most detailed.
numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) {
@@ -2631,7 +2578,7 @@
// Note that when adding the possible lengths from mobile, we have to again check they
// aren't empty since if they are this indicates they are the same as the general desc and
// should be obtained from there.
- possibleLengths.addAll(mobileDesc.getPossibleLengthCount() == 0
+ possibleLengths.addAll(mobileDesc.getPossibleLengthList().size() == 0
? metadata.getGeneralDesc().getPossibleLengthList()
: mobileDesc.getPossibleLengthList());
// The current list is sorted; we need to merge in the new list and re-sort (duplicates
@@ -3617,6 +3564,6 @@
logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode);
return false;
}
- return metadata.getMobileNumberPortableRegion();
+ return metadata.isMobileNumberPortableRegion();
}
}
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
index 5ac36b4..966ed39 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
@@ -113,9 +113,7 @@
return leadingDigitsPattern_;
}
@android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
- @Deprecated
- public int leadingDigitsPatternSize() { return getLeadingDigitsPatternCount(); }
- public int getLeadingDigitsPatternCount() { return leadingDigitsPattern_.size(); }
+ public int leadingDigitsPatternSize() { return leadingDigitsPattern_.size(); }
@android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
public String getLeadingDigitsPattern(int index) {
return leadingDigitsPattern_.get(index);
@@ -386,16 +384,6 @@
public PhoneMetadata build() {
return this;
}
-
- public Builder setId(String value) {
- super.setId(value);
- return this;
- }
-
- public Builder setInternationalPrefix(String value) {
- super.setInternationalPrefix(value);
- return this;
- }
}
public static Builder newBuilder() {
return new Builder();
@@ -407,12 +395,6 @@
public boolean hasGeneralDesc() { return hasGeneralDesc; }
@android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
public PhoneNumberDesc getGeneralDesc() { return generalDesc_; }
- public PhoneNumberDesc getGeneralDescBuilder() {
- if (generalDesc_ == null) {
- generalDesc_ = new PhoneNumberDesc();
- }
- return generalDesc_ ;
- }
public PhoneMetadata setGeneralDesc(PhoneNumberDesc value) {
if (value == null) {
throw new NullPointerException();
@@ -779,16 +761,10 @@
// repeated NumberFormat number_format = 19;
private java.util.List<NumberFormat> numberFormat_ = new java.util.ArrayList<NumberFormat>();
@android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
- @Deprecated
public java.util.List<NumberFormat> numberFormats() {
- return getNumberFormatList();
- }
- public java.util.List<NumberFormat> getNumberFormatList() {
return numberFormat_;
}
- @Deprecated
- public int numberFormatSize() { return getNumberFormatCount(); }
- public int getNumberFormatCount() { return numberFormat_.size(); }
+ public int numberFormatSize() { return numberFormat_.size(); }
public NumberFormat getNumberFormat(int index) {
return numberFormat_.get(index);
}
@@ -804,16 +780,10 @@
private java.util.List<NumberFormat> intlNumberFormat_ =
new java.util.ArrayList<NumberFormat>();
@android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
- @Deprecated
public java.util.List<NumberFormat> intlNumberFormats() {
- return getIntlNumberFormatList();
- }
- public java.util.List<NumberFormat> getIntlNumberFormatList() {
return intlNumberFormat_;
}
- @Deprecated
- public int intlNumberFormatSize() { return getIntlNumberFormatCount(); }
- public int getIntlNumberFormatCount() { return intlNumberFormat_.size(); }
+ public int intlNumberFormatSize() { return intlNumberFormat_.size(); }
public NumberFormat getIntlNumberFormat(int index) {
return intlNumberFormat_.get(index);
}
@@ -880,9 +850,7 @@
private boolean hasMobileNumberPortableRegion;
private boolean mobileNumberPortableRegion_ = false;
public boolean hasMobileNumberPortableRegion() { return hasMobileNumberPortableRegion; }
- @Deprecated
- public boolean isMobileNumberPortableRegion() { return getMobileNumberPortableRegion(); }
- public boolean getMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
+ public boolean isMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
public PhoneMetadata setMobileNumberPortableRegion(boolean value) {
hasMobileNumberPortableRegion = true;
mobileNumberPortableRegion_ = value;
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/ShortNumbersRegionCodeSet.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
index 12f1745..05b94d6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
@@ -30,9 +30,9 @@
public class ShortNumbersRegionCodeSet {
// A set of all region codes for which data is available.
static Set<String> getRegionCodeSet() {
- // The capacity is set to 321 as there are 241 different entries,
+ // The capacity is set to 320 as there are 240 different entries,
// and this offers a load factor of roughly 0.75.
- Set<String> regionCodeSet = new HashSet<String>(321);
+ Set<String> regionCodeSet = new HashSet<String>(320);
regionCodeSet.add("AC");
regionCodeSet.add("AD");
@@ -235,7 +235,6 @@
regionCodeSet.add("SN");
regionCodeSet.add("SO");
regionCodeSet.add("SR");
- regionCodeSet.add("SS");
regionCodeSet.add("ST");
regionCodeSet.add("SV");
regionCodeSet.add("SX");
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
index 015808a..5e10270 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
index 4d46fcf..d03d525 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
index 8f8615d..1e50e33 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
index 6806a00..ac762db 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
index 0500b27..ef8f6b9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
index 8fac331..fe18ba0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
index c26e30d..89d4f92 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
index 62b7502..2c8b5d5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
index 6813bd5..590270a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
index a84d878..24f6ff3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
index 66dd630..f70855f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
index 17508f9..59ef115 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
index dfe5078..11ed135 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
index 6ba5be4..fa9d67f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
index 3af1e38..46f7d48 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
index cb06fb8..7774283 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index 41c0092..518d27a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
index 29424fb..0bfb1c8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
index a54f4ca..1edc8ec 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
index 8367ee9..0e27752 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
index 9da6fb1..8a07a99 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
index 6cb25d7..9011103 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
index 401dafe..cdfe19b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
index 339334b..af69fa2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
index 71e260e..a745616 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
index 01bb8da..0ebc3f8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index dc01444..99930e0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
index 37bcc55..ae149cc 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 3214db5..2fc3fcb 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
index 8fa119b..cb1ca40 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
index bb43464..ea1d50e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
index 8dc7785..975e243 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
index efa9b05..263dda5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
index 06ea519..c5c88df 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
index 8c39610..3a02a3d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
index ed648e4..871bc2a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
index 6ccdd69..82c1b46 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
index e1cab68..f6de5b1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
index 21bc809..ed1330d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
index 5e981c8..9129855 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
index b29ac00..702957a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
index 7f8a039..66c94bf 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
index 8236543..afdb010 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
index e7e30ac..2260b6a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
index 8d341fb..f37beaf 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
index d98c24a..ba1b00f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
index ddebc8f..01977cc 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
index 283e679..f07ac53 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
index 3f7fcbb..a34eebe 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
index 492f70a..5ae18de 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
index 602a712..784fbc3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
index fcd3965..c5e3a73 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
index c06344a..c7a35b3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
index bfa1f13..201c513 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
index 3a938df..e7ac5d9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index ebb5fb4..750a818 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
index dc4b525..e3e520f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
index 2b89782..64ecb2d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
index 5a7271e..2de0b7d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
index 051f503..bf25f42 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
index 6128ffe..adcbef3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index cdfd1f8..75c7e4e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index b8763e6..05362f0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
index 4316331..c50382b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
index 0287104..cf08564 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
index 33d742f..555cd7f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
index 5a377cf..4f1787a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
index 4520dc9..c4a58d5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
index c7ee185..818108b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
index d52abcf..fd88ec8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
index 4f5eea5..f75507b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
index b11e9fd..75ebe2a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
index e11e957..95116db 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
index 009e48a..46262b9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
index 8a056eb..cc84dd5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
index e1da75c..df48e2e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index 296fcf9..e35c866 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
index b86a9eb..41b16c8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
index 9fdea27..830e190 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
index 523e2b9..647c0f5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
index eb13b97..2a1014f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
index d0da850..1c99746 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
index 3259f87..bcfab3b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
index c3e4ea9..d08ab51 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
index f6a759c..1f8a02e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
index fa3499a..8f9af66 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index 7d93862..5424db9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
index 0075295..3d3105e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
index 11de05a..b1b53ac 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
index 93dc67a..150cedd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
index 6ce88ce..8bbe40c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
index 28a2ba4..7715a99 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
index 993af32..f543a57 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
index 50b27e6..0fd10f3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 9489e89..1322f53 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index 8a72062..8263606 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
index c75dce6..7427602 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
index 0cea04e..c675b33 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
index bd6d7e5..0c26eba 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
index fa01bc2..62d29a6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
index 3588cb1..5c8fcbd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index 9758535..cccb113 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
index ec6030f..3924858 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
index 7672fa3..56af97a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
index 1042b05..7f84e6a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
index dc8fdc2..329ba10 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
index 0c9dd32..766d17f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
index 9c1a73f..8474b60 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index 54c5bec..bdcc2ce 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index a86322a..9dbb909 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
index 4ba2278..6905f1c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
index bc037fa..138f831 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
index 33f6923..f8d42e1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
index 99dbcc0..78958ee 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
index 85135ca..27ef569 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
index 76b8bc9..37f28c5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
index 265c400..f2a4933 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
index 4574615..0469e24 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
index 2a00a07..3f80cf8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
index 94c3deb..61bf8c5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
index 0849ea3..8ddfa2c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index 47c2eec..283a8f1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
index 9a57e59..5bef260 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
index 9aec876..ca21189 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
index a4d20b8..e4c2c8e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
index 8df82b0..28b30d3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
index 89b4bcc..ab0eb3e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
index 213fd6e..f24e3ce 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
index 7efdbae..c0b73d1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
index dbd636e..03c5ef3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
index 5ab6a0d..b3159b5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
index 842413a..10ea2da 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
index 41b92f5..628b3e6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
index f8b5f35..bba1e5b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
index 51ff6a4..21820fa 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
index cde7ce6..0e2f088 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
index 669f02a..3e8227d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
index 365bafd..5daadbf 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
index 594de97..f0370fd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
index a885cb5..3a4940d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
index 4622c35..afd1bb6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
index 7188cf2..28d2155 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
index bc9cbd8..5c6c8db 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
index 7c92f62..0e50b28 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
index 32c8645..13c181b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
index 12173c6..9d8fb70 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
index 6e06811..4d253b1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
index 36dc1e3..104b489 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
index 996df6d..91b1c26 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index 49e38ad..99e0866 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
index eb71584..26b59f4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
index 6ec881f..e51eab3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
index 45b707a..3060a18 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
index 7eae310..0e27484 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
index 81dd47e..18719fc 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
index 9d5a91b..c60a796 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
index 7881bc5..3cc8906 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
index 56449a3..567bc89 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
index 305b85e..56f4ca5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
index 67735fa..e3b9d7a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
index aa7672e..b5bf134 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
index 15e4a2a..8dc8e7f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
index 78bb1e1..d9615cd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
index 981177c..3f4c84e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
index 857b6d9..81f1f6b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
index dddb34e..aa0ec2b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index bececb6..cdd4e2c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
index 5e3bcf8..7c60466 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
index c8b3629..5a5d1be 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
index caeb2ec..60fe5d9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
index 15c760f..c866916 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
index 7b882a2..dd71baf 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
index fb9422c..085354c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index d3d777c..2d4aa17 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
index 0e2e60c..6d881b4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
index 2b1ed7f..a9a460f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
index 0688624..4763de6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
index 77b405f..1f0b725 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
index def0b3e..315a444 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
index 3e56482..b1fd078 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
index cc506d6..814458c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
index c2bb116..f4a21ec 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
index 06dcf45..804576e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
index b0fd135..41aadc8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
index 1f1ce10..ee304f1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
index 23c5649..c76cd56 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
index c11bfe3..ae8a5d5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
index 9133378..4d8a8c4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
index 4b6aa0b..58c49b4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
index 13d9626..f80317e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
index 46181d0..0d19153 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
index 93be3b4..aa999aa 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
index 0a6dc03..5cb4c70 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
index ddbeb93..545acd6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
index 80164d3..099abad 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
index cac43d9..9ddaa6d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
index 19a6bcc..77b1c37 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
index d08e73c..1b38fad 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
index f885919..4fd5bef 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
index ac1bd52..7af1941 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
index b33e278..dd28438 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
index 2542dac..f6a9ca7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
index 7cfd32e..63c6552 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
index 2e7992d..26a0a83 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
index 057bc58..7def0b0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
index b340ff4..b0a9091 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
index 0a8fd5a..37a25cd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
index 4512db7..2f76125 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
index 7090236..ed5f1c2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
index a4fdd21..120733e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
index dc8edc1..ec0dc88 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
index e64d262..1196415 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
index cec9da0..b1d2c0b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
index ab36170..12ff2b2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
index 9cad69b..c2db122 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
index 7b82adf..6dab4fd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
index 2fbdcd8..7ab70d5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
index 64f218f..4e0a8f0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
index b940c97..feefd0b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
index 1813fab..d794458 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
index ab06258..583c0c5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
index 0042867..7b61318 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
index 46bf730..ae066ec 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
index 31f262d..839a4a6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
index bfb8634..9a777b7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
index 13b2e9e..ff54ca3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
index abfff57..14d3b76 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
index 3695f2c..51e48ad 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
index 83cf491..f674cb1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
index 5e16591..fb4de36 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
index 9bb22e0..fdb7123 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
index c901e02..78f089f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
index e961451..13fe8a6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
index 5b88b7a..2a56c46 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
index f9d3bca..4ca8ec7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
index 1aa16bb..ab4b2ad 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ET b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
index 2041eca..8053fb9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
index ec2c9fd..f150252 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
index 850ba17..98b5791 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
index ea33a67..deaa0e8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
index 08e2520..daf2bcd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
index fd3e40f..97a01cc 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
index 4683a44..58d7134 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
index aebc1cf..7039793 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_HU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
index bc6a0cc..6a92ffa 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ID b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
index 86b5c43..c6aea9b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
index 03cf2c3..49a20b3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
index 50e29a4..dbd573a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
index ee52982..510227c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
index 7f35372..c4fc13a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
index 6c8e21e..c5b01cd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
index 531a36a..05486d0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
index 392bc44..2f81756 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
index bd7b516..84888cd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
index 8c90003..776bb83 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
index 364316d..3ded7e0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
index 0a82344..8b2fc41 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
index 0c3664f..5b95e0a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
index 90f87cd..0ccb213 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
index f288a7c..0458496 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
index 9d77fc1..aca9857 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
index 5de895f..15ffc49 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
index 3b46029..6a92ce3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
index 6a3ac5b..d647760 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_OM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
index 77d9e3e..bf7eb3f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
index eb3734c..0ddedf6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
index 53ab50c..a71337b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
index c888bcb..4860822 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
index 106b9fc..d6b1c18 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
index ce332e7..d50a5a0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
index 9b5aabd..0ba762b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
index 480c607..07f849f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
index 9e0046f..1d904c2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
index ebaac11..001199f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
index 191f503..e1a6e8f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
index 05e8cf7..42355f3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
index 0217bfd..174c0e9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SS
deleted file mode 100644
index a2d700a..0000000
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SS
+++ /dev/null
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
index ea017d0..ca67d4f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
index 8a301f4..ee931b6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
index 0e4b300..174a66c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
index fd3a1fd..8e22d99 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
index f3c193b..7c24669 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
index ee5e4fd..f518998 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
index 7f3a75a..d3afe7e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
index 91563ba..0dc8de2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
index b977ac2..bb0cb82 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_US b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_US
index c0b3867..28c638a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_US
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_US
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
index 6b22ead..18bbe33 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
index a91f925..dc912d7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
index b8e1de8..cdfdd92 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
Binary files differ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_WS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
index 011b07b..ab79ab8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
Binary files differ
