diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-22 19:08:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-22 19:08:08 +0000 |
| commit | e75cfdc7e7535acd80d7676b0298fb8eb0c608ff (patch) | |
| tree | df8bb64a3599946cae82ee74fd44fca4d2a96d73 | |
| parent | 9707150d10b5e323a8244bc8cc8f8762457d1dd2 (diff) | |
| parent | cba5c4007938cbcdd46b0640af8a864f6fb89fa5 (diff) | |
| download | libphonenumber-e75cfdc7e7535acd80d7676b0298fb8eb0c608ff.tar.gz | |
am cba5c400: Merge "Revert "Temporary workaround to prevent automated jarjar renaming.""
* commit 'cba5c4007938cbcdd46b0640af8a864f6fb89fa5':
Revert "Temporary workaround to prevent automated jarjar renaming."
| -rw-r--r-- | libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 760e0009..418164a8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -77,13 +77,8 @@ public class PhoneNumberUtil { // 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"; |