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

Commit 0f3235a1 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Update settings to use latest IDs for zones" 

am: c75dbe9d

Change-Id: If3708653ad78fb38e57508c4d8fac9dd5bffc2c1
parents 84c2fb20 c75dbe9d

packages/SettingsLib/res/xml/timezones.xml

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <timezone id="America/St_Johns"></timezone>

    <timezone id="America/Recife"></timezone>

    <timezone id="America/Sao_Paulo"></timezone>

    <timezone id="America/Buenos_Aires"></timezone>

    <timezone id="America/Argentina/Buenos_Aires"></timezone>

    <timezone id="America/Godthab"></timezone>

    <timezone id="America/Montevideo"></timezone>

    <timezone id="Atlantic/South_Georgia"></timezone>
@@ -58,11 +58,11 @@ 
    <timezone id="Asia/Karachi"></timezone>

    <timezone id="Asia/Oral"></timezone>

    <timezone id="Asia/Yekaterinburg"></timezone>

    <timezone id="Asia/Calcutta"></timezone>

    <timezone id="Asia/Kolkata"></timezone>

    <timezone id="Asia/Colombo"></timezone>

    <timezone id="Asia/Katmandu"></timezone>

    <timezone id="Asia/Kathmandu"></timezone>

    <timezone id="Asia/Almaty"></timezone>

    <timezone id="Asia/Rangoon"></timezone>

    <timezone id="Asia/Yangon"></timezone>

    <timezone id="Asia/Krasnoyarsk"></timezone>

    <timezone id="Asia/Bangkok"></timezone>

    <timezone id="Asia/Jakarta"></timezone>