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

Commit 47454c56 authored by Xin Li's avatar Xin Li
Browse files

Merge Android10 QPR1 into AOSP master 

Bug: 145570283
Change-Id: Ia69fe4178aca4d61c873ee877470e8a2d73a2d86
parents b7933e28 275b61b1

perf-tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ android_test { 


    static_libs: [

        "androidx.legacy_legacy-support-v4",

        "androidx.test.rules",

        "androidx.test.espresso.core",

        "mockito-target",

        "ub-janktesthelper",

res/values-af/inspector_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -44,4 +44,6 @@ 
    <string name="metadata_composer" msgid="4696926808308256056">"Komponis"</string>

    <string name="metadata_album" msgid="1661699531214720236">"Album"</string>

    <string name="metadata_address" msgid="1849921023707744640">"Ligging"</string>

    <string name="debug_stream_types" msgid="2088565280360139333">"Stroomtipes"</string>

    <string name="debug_raw_size" msgid="7487139640175650185">"Onverwerkte grootte (grepe)"</string>

</resources>

res/values-af/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -243,8 +243,7 @@ 
    <string name="apps_row_title" msgid="3340490016663092925">"Blaai deur lêers in ander programme"</string>

    <string name="anonymous_application" msgid="7633027057951625862">"Anoniem"</string>

    <string name="open_tree_button" msgid="19992834788135845">"Gee toegang tot \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\""</string>

    <string name="open_tree_dialog_title" msgid="8429465292253532274">"Laat toegang tot \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\" toe in \"<xliff:g id="ROOT">%2$s</xliff:g>\"?"</string>

    <string name="open_tree_dialog_title" msgid="6978383241897450134">"Gee toegang tot \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\" op \"<xliff:g id="ROOT">%2$s</xliff:g>\"?"</string>

    <string name="open_tree_dialog_message" msgid="8545093618524340168">"Dit sal \"<xliff:g id="APPNAME">%1$s</xliff:g>\" volle toegang gee tot alle lêers wat tans onder hierdie ligging geberg word, asook enige toekomstige inhoud wat hier geberg word."</string>

    <string name="search_bar_hint" msgid="4517366509897977321">"Deursoek hierdie foon"</string>

    <string name="delete_search_history" msgid="2202015025607694515">"Vee soekgeskiedenis uit: <xliff:g id="TEXT">%1$s</xliff:g>"</string>

</resources>

res/values-am/inspector_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -44,4 +44,6 @@ 
    <string name="metadata_composer" msgid="4696926808308256056">"የሙዚቃ ደራሲ"</string>

    <string name="metadata_album" msgid="1661699531214720236">"አልበም"</string>

    <string name="metadata_address" msgid="1849921023707744640">"አካባቢ"</string>

    <string name="debug_stream_types" msgid="2088565280360139333">"የዥረት አይነቶች"</string>

    <string name="debug_raw_size" msgid="7487139640175650185">"የጥሬ መጠን (ባይት)"</string>

</resources>

res/values-am/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -243,8 +243,7 @@ 
    <string name="apps_row_title" msgid="3340490016663092925">"ፋይሎችን በሌሎች መተግበሪያዎች ውስጥ ያስሱ"</string>

    <string name="anonymous_application" msgid="7633027057951625862">"ስም-አልባ"</string>

    <string name="open_tree_button" msgid="19992834788135845">"የ«<xliff:g id="DIRECTORY">%1$s</xliff:g>» መዳረሻን ፍቀድ"</string>

    <string name="open_tree_dialog_title" msgid="8429465292253532274">"በ«<xliff:g id="ROOT">%2$s</xliff:g>» ውስጥ የ«<xliff:g id="DIRECTORY">%1$s</xliff:g>» መዳረሻ ይፈቀድ?"</string>

    <string name="open_tree_dialog_title" msgid="6978383241897450134">"በ«<xliff:g id="ROOT">%2$s</xliff:g>» ላይ የ«<xliff:g id="DIRECTORY">%1$s</xliff:g>» መዳረሻ ይፈቀድ?"</string>

    <string name="open_tree_dialog_message" msgid="8545093618524340168">"«<xliff:g id="APPNAME">%1$s</xliff:g>» በአሁኑ ጊዜ በዚህ ቦታ ላይ የተከማቹ እና ወደፊት በዚህ ላይ የሚከማቹ ማናቸውም ሁሉም ፋይሎች ሙሉ መዳረሻ እንዲኖረው ያስችላል።"</string>

    <string name="search_bar_hint" msgid="4517366509897977321">"ይህን ስልክ ይፈልጉ"</string>

    <string name="delete_search_history" msgid="2202015025607694515">"የፍለጋ ታሪክ ይሰርዙ <xliff:g id="TEXT">%1$s</xliff:g>"</string>

</resources>