Upgrade to 8.7.1

Created using ./update-from-external.sh 8.7.1

m -j32 droid
adb reboot bootloader
fastboot flashall -w
m -j32 cts
cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.PhoneNumberUtilsTest
m -j32 libphonenumber-test vogar dx
vogar --timeout 0 \
    --classpath ${ANDROID_BUILD_TOP}/out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jack \
        com.google.i18n.phonenumbers

Bug: 36705773
Test: as above
Change-Id: I07781a60d9052347968ea734226e43a5dac5f837

1 files changed, 3 insertions, 1 deletions

diff --git a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
index 81cec2ce..0730c3b0 100644
--- a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
+++ b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
@@ -132,6 +132,8 @@ public class PhoneNumberParserServlet extends HttpServlet {
     } else {
       geocodingLocale = Locale.forLanguageTag(geocodingParam);
     }
+    resp.setContentType("text/html");
+    resp.setCharacterEncoding(UTF_8.name());
     resp.getWriter().println(
         getOutputForSingleNumber(phoneNumber, defaultCountry, geocodingLocale));
   }
@@ -274,7 +276,7 @@ public class PhoneNumberParserServlet extends HttpServlet {
       PhoneNumber number = phoneUtil.parseAndKeepRawInput(phoneNumber, defaultCountry);
       output.append("<DIV>");
       output.append("<TABLE border=1>");
-      output.append("<TR><TD colspan=2>Parsing Result</TD></TR>");
+      output.append("<TR><TD colspan=2>Parsing Result (parseAndKeepRawInput())</TD></TR>");
 
       appendLine("country_code", Integer.toString(number.getCountryCode()), output);
       appendLine("national_number", Long.toString(number.getNationalNumber()), output);