From 485e6d5c6e48a1fc43cc0a090e687c723dac056c Mon Sep 17 00:00:00 2001
From: Shaopeng Jia <shaopengjia@google.com>
Date: Fri, 26 Apr 2013 12:45:24 +0200
Subject: Update external/libphonenumber to v5.4

Change-Id: I6af343e55d0bd77e8c017f5cd2b395a7f9700d54
---
 .../android/i18n/phonenumbers/PhoneNumberUtil.java |  58 +++++++++++----------
 .../phonenumbers/data/PhoneNumberMetadataProto_BD  | Bin 1170 -> 2220 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_BE  | Bin 727 -> 728 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_BF  | Bin 444 -> 446 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_BY  | Bin 766 -> 766 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_CA  | Bin 736 -> 756 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_CD  | Bin 467 -> 541 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_CN  | Bin 3404 -> 3553 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_CZ  | Bin 744 -> 741 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_DK  | Bin 396 -> 398 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_EH  | Bin 371 -> 370 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_GN  | Bin 525 -> 575 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_GR  | Bin 881 -> 875 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_IE  | Bin 1262 -> 1244 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_IN  | Bin 3706 -> 3741 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_IR  | Bin 1123 -> 1129 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_IS  | Bin 755 -> 757 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_JP  | Bin 5359 -> 5364 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_KH  | Bin 623 -> 636 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_KR  | Bin 1406 -> 1431 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_KW  | Bin 517 -> 516 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_LI  | Bin 955 -> 951 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_LR  | Bin 595 -> 585 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_MA  | Bin 778 -> 777 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_MU  | Bin 538 -> 545 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_MY  | Bin 751 -> 773 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_NZ  | Bin 866 -> 867 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_PA  | Bin 882 -> 882 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_PT  | Bin 532 -> 579 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_SE  | Bin 2328 -> 2335 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_SG  | Bin 600 -> 597 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_TL  | Bin 430 -> 425 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_TT  | Bin 568 -> 578 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_UG  | Bin 589 -> 607 bytes
 .../phonenumbers/data/PhoneNumberMetadataProto_ZW  | Bin 1676 -> 1719 bytes
 .../i18n/phonenumbers/geocoding/data/1236_en       | Bin 0 -> 41 bytes
 .../i18n/phonenumbers/geocoding/data/1365_en       | Bin 0 -> 32 bytes
 .../i18n/phonenumbers/geocoding/data/1437_en       | Bin 0 -> 32 bytes
 .../i18n/phonenumbers/geocoding/data/1639_en       | Bin 0 -> 37 bytes
 .../i18n/phonenumbers/geocoding/data/263_en        | Bin 924 -> 1377 bytes
 .../i18n/phonenumbers/geocoding/data/375_be        | Bin 0 -> 5305 bytes
 .../i18n/phonenumbers/geocoding/data/375_en        | Bin 0 -> 2806 bytes
 .../i18n/phonenumbers/geocoding/data/375_ru        | Bin 0 -> 5173 bytes
 .../android/i18n/phonenumbers/geocoding/data/82_cs | Bin 0 -> 298 bytes
 .../android/i18n/phonenumbers/geocoding/data/82_en | Bin 227 -> 244 bytes
 .../android/i18n/phonenumbers/geocoding/data/82_fr | Bin 177 -> 197 bytes
 .../android/i18n/phonenumbers/geocoding/data/82_ko | Bin 215 -> 227 bytes
 .../android/i18n/phonenumbers/geocoding/data/82_zh | Bin 284 -> 299 bytes
 .../i18n/phonenumbers/geocoding/data/82_zh_Hant    | Bin 284 -> 299 bytes
 .../android/i18n/phonenumbers/geocoding/data/98_en | Bin 3359 -> 3342 bytes
 .../android/i18n/phonenumbers/geocoding/data/98_fa | Bin 4418 -> 4399 bytes
 .../i18n/phonenumbers/geocoding/data/config        | Bin 5123 -> 5197 bytes
 52 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/1236_en
 create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/1365_en
 create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/1437_en
 create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/1639_en
 create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/375_be
 create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/375_en
 create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/375_ru
 create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/82_cs

(limited to 'java/src/com')

diff --git a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index 32076ef5..fc42fcf4 100644
--- a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -1203,43 +1203,47 @@ public class PhoneNumberUtil {
       return number.hasRawInput() ? number.getRawInput() : "";
     }
 
-    String formattedNumber;
+    String formattedNumber = "";
     // Clear the extension, as that part cannot normally be dialed together with the main number.
     PhoneNumber numberNoExt = new PhoneNumber().mergeFrom(number).clearExtension();
-    PhoneNumberType numberType = getNumberType(numberNoExt);
     String regionCode = getRegionCodeForCountryCode(countryCallingCode);
-    if (regionCode.equals("CO") && regionCallingFrom.equals("CO")) {
-      if (numberType == PhoneNumberType.FIXED_LINE) {
+    if (regionCallingFrom.equals(regionCode)) {
+      PhoneNumberType numberType = getNumberType(numberNoExt);
+      boolean isFixedLineOrMobile =
+          (numberType == PhoneNumberType.FIXED_LINE) || (numberType == PhoneNumberType.MOBILE) ||
+          (numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE);
+      // Carrier codes may be needed in some countries. We handle this here.
+      if (regionCode.equals("CO") && numberType == PhoneNumberType.FIXED_LINE) {
         formattedNumber =
             formatNationalNumberWithCarrierCode(numberNoExt, COLOMBIA_MOBILE_TO_FIXED_LINE_PREFIX);
+      } else if (regionCode.equals("BR") && isFixedLineOrMobile) {
+        formattedNumber = numberNoExt.hasPreferredDomesticCarrierCode()
+            ? formattedNumber = formatNationalNumberWithPreferredCarrierCode(numberNoExt, "")
+            // Brazilian fixed line and mobile numbers need to be dialed with a carrier code when
+            // called within Brazil. Without that, most of the carriers won't connect the call.
+            // Because of that, we return an empty string here.
+            : "";
       } else {
-        // E164 doesn't work at all when dialing within Colombia.
-        formattedNumber = format(numberNoExt, PhoneNumberFormat.NATIONAL);
+        // For NANPA countries, non-geographical countries, and Mexican fixed line and mobile
+        // numbers, we output international format for numbers that can be dialed internationally
+        // as that always works.
+        if ((countryCallingCode == NANPA_COUNTRY_CODE ||
+            regionCode.equals(REGION_CODE_FOR_NON_GEO_ENTITY) ||
+            // MX fixed line and mobile numbers should always be formatted in international format,
+            // even when dialed within MX. For national format to work, a carrier code needs to be
+            // used, and the correct carrier code depends on if the caller and callee are from the
+            // same local area. It is trickier to get that to work correctly than using
+            // international format, which is tested to work fine on all carriers.
+            (regionCode.equals("MX") && isFixedLineOrMobile)) &&
+            canBeInternationallyDialled(numberNoExt)) {
+          formattedNumber = format(numberNoExt, PhoneNumberFormat.INTERNATIONAL);
+        } else {
+          formattedNumber = format(numberNoExt, PhoneNumberFormat.NATIONAL);
+        }
       }
-    } else if (regionCode.equals("PE") && regionCallingFrom.equals("PE")) {
-      // In Peru, numbers cannot be dialled using E164 format from a mobile phone for Movistar.
-      // Instead they must be dialled in national format.
-      formattedNumber = format(numberNoExt, PhoneNumberFormat.NATIONAL);
-    } else if (regionCode.equals("AE") && regionCallingFrom.equals("AE") &&
-               numberType == PhoneNumberType.UAN) {
-      // In the United Arab Emirates, numbers with the prefix 600 (UAN numbers) cannot be dialled
-      // using E164 format. Instead they must be dialled in national format.
-      formattedNumber = format(numberNoExt, PhoneNumberFormat.NATIONAL);
-    } else if (regionCode.equals("BR") && regionCallingFrom.equals("BR") &&
-        ((numberType == PhoneNumberType.FIXED_LINE) || (numberType == PhoneNumberType.MOBILE) ||
-         (numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE))) {
-      formattedNumber = numberNoExt.hasPreferredDomesticCarrierCode()
-          ? formatNationalNumberWithPreferredCarrierCode(numberNoExt, "")
-          // Brazilian fixed line and mobile numbers need to be dialed with a carrier code when
-          // called within Brazil. Without that, most of the carriers won't connect the call.
-          // Because of that, we return an empty string here.
-          : "";
     } else if (canBeInternationallyDialled(numberNoExt)) {
       return withFormatting ? format(numberNoExt, PhoneNumberFormat.INTERNATIONAL)
                             : format(numberNoExt, PhoneNumberFormat.E164);
-    } else {
-      formattedNumber = (regionCallingFrom.equals(regionCode))
-          ? format(numberNoExt, PhoneNumberFormat.NATIONAL) : "";
     }
     return withFormatting ? formattedNumber
                           : normalizeHelper(formattedNumber, DIALLABLE_CHAR_MAPPINGS,
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
index 229f964e..45050b96 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
index 27e37398..f67a8b07 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index 82942ae9..9b9a506e 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY
index a78037b1..268949e2 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
index 19604989..010bc9a3 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
index 4c79a929..e79d8069 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
index d79fb8b6..58db0682 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
index 84ac0f54..59389cd2 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
index 739f03b3..ead71e72 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
index 0de408e7..06eb8d9e 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
index a5198af2..262cbbd7 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
index ee3e6712..165568f3 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
index 54a12bfd..aad65550 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 8c292da7..89f832f6 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index 5af5d869..08534eef 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
index 97006bee..62a558ec 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index 9f733000..ada4eeb5 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH
index a333014b..54da4aa0 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index d8344af8..cb17c767 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index 05d679fb..e475245c 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
index 36720945..c7bfe096 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
index 0f2380c1..bb252241 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index 9ac0659c..1d4f1410 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
index c0b385ec..cf6c57e8 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
index 2f1dbbd1..fd2128ce 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index d67fad0c..4f7a0b18 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
index a725f8c3..0c708f1f 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
index 4f001587..5264d37a 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
index e52ec10f..0a28bc20 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index 713a01a9..71d6e76c 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
index 6d3fe559..7da2c85c 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
index f15107f9..9e92e1a6 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
index 039084ff..284f3873 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
index 8efafcf8..a5baf970 100644
Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1236_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1236_en
new file mode 100644
index 00000000..40b369ea
Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/1236_en differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1365_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1365_en
new file mode 100644
index 00000000..89d25904
Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/1365_en differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1437_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1437_en
new file mode 100644
index 00000000..99927565
Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/1437_en differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1639_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1639_en
new file mode 100644
index 00000000..090d2b4e
Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/1639_en differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/263_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/263_en
index 7ec8339e..5df9b2fe 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/263_en and b/java/src/com/android/i18n/phonenumbers/geocoding/data/263_en differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/375_be b/java/src/com/android/i18n/phonenumbers/geocoding/data/375_be
new file mode 100644
index 00000000..288cfa02
Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/375_be differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/375_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/375_en
new file mode 100644
index 00000000..d46557b5
Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/375_en differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/375_ru b/java/src/com/android/i18n/phonenumbers/geocoding/data/375_ru
new file mode 100644
index 00000000..1392398d
Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/375_ru differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_cs b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_cs
new file mode 100644
index 00000000..bf568876
Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_cs differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_en
index cd18ecbf..96a01658 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_en and b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_en differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_fr b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_fr
index ff3f6329..dea606c8 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_fr and b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_fr differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_ko b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_ko
index cbc30173..e833c20f 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_ko and b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_ko differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_zh b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_zh
index d452ab7a..6e53fd69 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_zh and b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_zh differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_zh_Hant b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_zh_Hant
index a6a94525..6559ae2f 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/82_zh_Hant and b/java/src/com/android/i18n/phonenumbers/geocoding/data/82_zh_Hant differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/98_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/98_en
index e0c7504b..d0e02edc 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/98_en and b/java/src/com/android/i18n/phonenumbers/geocoding/data/98_en differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/98_fa b/java/src/com/android/i18n/phonenumbers/geocoding/data/98_fa
index 200e1114..09ee72ba 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/98_fa and b/java/src/com/android/i18n/phonenumbers/geocoding/data/98_fa differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/config b/java/src/com/android/i18n/phonenumbers/geocoding/data/config
index 9cb67089..041f163f 100644
Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/config and b/java/src/com/android/i18n/phonenumbers/geocoding/data/config differ
-- 
cgit v1.2.3