Merge "Revert "Temporary workaround to prevent automated jarjar renaming.""
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 760e000..418164a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -77,13 +77,8 @@
// input from overflowing the regular-expression engine.
private static final int MAX_INPUT_STRING_LENGTH = 250;
- // Begin ANDROID-CHANGED
- //
- // TODO: Revert this hideous hack once the build system has been changed
- // to let resource files be jar-jared.
private static final String META_DATA_FILE_PREFIX =
- "/com/gaggle/i18n/phonenumbers/data/PhoneNumberMetadataProto".replace("gaggle", "google");
- // End ANDROID-CHANGED
+ "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto";
// Region-code for the unknown region.
private static final String UNKNOWN_REGION = "ZZ";