Merge branch 'master' into hash_as_diallable_char

cpp/test/phonenumbers/phonenumberutil_test.cc

@@ -1005,7 +1005,7 @@ TEST_F(PhoneNumberUtilTest, FormatWithPreferredCarrierCode) {
   phone_util_.FormatNationalNumberWithPreferredCarrierCode(ar_number, "15",
                                                            &formatted_number);
   EXPECT_EQ("01234   12-5678", formatted_number);
-  // When the preferred_domestic_carrier_code is present but empty, treat is as
+  // When the preferred_domestic_carrier_code is present but empty, treat it as
   // unset and use instead the default carrier code passed in.
   ar_number.set_preferred_domestic_carrier_code("");
   phone_util_.FormatNationalNumberWithPreferredCarrierCode(ar_number, "15",

java/pending_code_changes.txt

@@ -1,3 +1,6 @@
+GitHub project changes:
+ - Changed tag to vX.Y.Z from libphonenumber-X.Y.Z; this may affect ports and
+   derived projects.
 Code changes:
  - Using new possibleLengthInfo to decide whether a short number is the right
    length or not. This could result in more specific results; whereas before, a

java/pom.xml

@@ -146,7 +146,7 @@
         <artifactId>maven-release-plugin</artifactId>
         <version>2.2.1</version>
         <configuration>
-          <tagNameFormat>libphonenumber-@{project.version}</tagNameFormat>
+          <tagNameFormat>v@{project.version}</tagNameFormat>
         </configuration>
       </plugin>
       <plugin>