Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4771bf0 authored by Victor Chang's avatar Victor Chang Committed by Automerger Merge Worker
Browse files

Merge "Regenerate LocaleDataLookup with CLDR patches" into main am: 24f92f9e am: 4e0efee3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3540981



Change-Id: Ib9c0efd96ead1ee2bff2a58ff4ccf6ad2e69112d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc219cbe 4e0efee3

libs/androidfw/LocaleDataLookup.cpp

+0 −2
Original line number Diff line number Diff line
@@ -5774,7 +5774,6 @@ const char* lookupLikelyScript(uint32_t packed_lang_region) { 
        case 0xD2120000u: // squ -> Latn

        case 0x73724D45u: // sr-ME -> Latn

        case 0x7372524Fu: // sr-RO -> Latn

        case 0x73725255u: // sr-RU -> Latn

        case 0x73725452u: // sr-TR -> Latn

        case 0x82320000u: // sra -> Latn

        case 0x92320000u: // sre -> Latn
@@ -7265,7 +7264,6 @@ const char* lookupLikelyScript(uint32_t packed_lang_region) { 
            return SCRIPT_CODES[73u];

        case 0x8ACD0000u: // nwc -> Newa

            return SCRIPT_CODES[74u];

        case 0xB40C474Eu: // man-GN -> Nkoo

        case 0xBA0D0000u: // nqo -> Nkoo

            return SCRIPT_CODES[75u];

        case 0xDCF90000u: // zhx -> Nshu