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

Commit 5b49c68d authored by Bill Yi's avatar Bill Yi
Browse files

Merge mainline-release 6664920 to master - DO NOT MERGE 

Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
parents c26848e7 717c1889

apex/extservices/apex_manifest.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

  "name": "com.android.extservices",

  "name": "com.android.extservices",

  "version": 300000000

  "version": 300900700

}
 
}

apex/permission/apex_manifest.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

  "name": "com.android.permission",

  "name": "com.android.permission",

  "version": 300000000

  "version": 300900700

}
 
}

apex/statsd/apex_manifest.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

  "name": "com.android.os.statsd",

  "name": "com.android.os.statsd",

  "version": 300000000

  "version": 300900700

}

}

core/res/res/values-ar/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -1169,7 +1169,7 @@ 
    <string name="Midnight" msgid="8176019203622191377">"منتصف الليل"</string>

    <string name="Midnight" msgid="8176019203622191377">"منتصف الليل"</string>

    <string name="elapsed_time_short_format_mm_ss" msgid="8689459651807876423">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>

    <string name="elapsed_time_short_format_mm_ss" msgid="8689459651807876423">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>

    <string name="elapsed_time_short_format_h_mm_ss" msgid="2302144714803345056">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>

    <string name="elapsed_time_short_format_h_mm_ss" msgid="2302144714803345056">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>

    <string name="selectAll" msgid="1532369154488982046">"تحديد الكل"</string>

    <string name="selectAll" msgid="1532369154488982046">"اختيار الكل"</string>

    <string name="cut" msgid="2561199725874745819">"قص"</string>

    <string name="cut" msgid="2561199725874745819">"قص"</string>

    <string name="copy" msgid="5472512047143665218">"نسخ"</string>

    <string name="copy" msgid="5472512047143665218">"نسخ"</string>

    <string name="failed_to_copy_to_clipboard" msgid="725919885138539875">"تعذّر النسخ في الحافظة"</string>

    <string name="failed_to_copy_to_clipboard" msgid="725919885138539875">"تعذّر النسخ في الحافظة"</string>

core/res/res/values-hi/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -1548,7 +1548,7 @@ 
    <string name="launchBrowserDefault" msgid="6328349989932924119">"ब्राउज़र लॉन्च करें?"</string>

    <string name="launchBrowserDefault" msgid="6328349989932924119">"ब्राउज़र लॉन्च करें?"</string>

    <string name="SetupCallDefault" msgid="5581740063237175247">"कॉल स्वीकार करें?"</string>

    <string name="SetupCallDefault" msgid="5581740063237175247">"कॉल स्वीकार करें?"</string>

    <string name="activity_resolver_use_always" msgid="5575222334666843269">"हमेशा"</string>

    <string name="activity_resolver_use_always" msgid="5575222334666843269">"हमेशा"</string>

    <string name="activity_resolver_use_once" msgid="948462794469672658">"सिर्फ़ एक बार"</string>

    <string name="activity_resolver_use_once" msgid="948462794469672658">"केवल एक बार"</string>

    <string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$s वर्क प्रोफ़ाइल का समर्थन नहीं करता"</string>

    <string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$s वर्क प्रोफ़ाइल का समर्थन नहीं करता"</string>

    <string name="default_audio_route_name" product="tablet" msgid="367936735632195517">"टैबलेट"</string>

    <string name="default_audio_route_name" product="tablet" msgid="367936735632195517">"टैबलेट"</string>

    <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"टीवी"</string>

    <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"टीवी"</string>