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

Commit 0873eb7b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4741663, 4741664, 4741665, 4741666, 4743080, 4743081,... 

Merge cherrypicks of [4741663, 4741664, 4741665, 4741666, 4743080, 4743081, 4743082, 4743083, 4741262, 4741263, 4741264, 4741265, 4741266, 4741667, 4743084, 4741242, 4741243, 4741741, 4741742, 4741743, 4741744, 4741822, 4743085, 4741668, 4741338, 4743055, 4743056, 4743070, 4743073, 4743075, 4743076, 4743078, 4743079, 4743161, 4743162, 4743164, 4743165, 4743167, 4743168, 4743169, 4743170, 4741681, 4741682, 4741683, 4741684, 4741685, 4741686, 4741687, 4741688, 4741689, 4741690, 4741691, 4741692, 4741693, 4741694, 4741695, 4741696, 4741697, 4741698, 4741699, 4743240, 4743241, 4743242, 4743243, 4741745, 4741823, 4741824, 4741825, 4741267, 4741268, 4743244, 4743280, 4743281, 4743224, 4743203, 4743204, 4743205, 4741746, 4741747, 4743245, 4741826, 4741827, 4741828, 4741829, 4741748, 4741749, 4741750, 4743233, 4743282, 4741244, 4741245, 4741246, 4741247, 4743206, 4743207, 4743208, 4743209, 4743210, 4743211, 4743212, 4743213, 4743214, 4743215, 4743216, 4743217, 4743218, 4743219, 4743360, 4743361, 4743362, 4743363, 4743364, 4743365, 4743366, 4743367, 4743368, 4743369, 4743370, 4743371, 4743372, 4743373, 4743374, 4743375, 4743376, 4743377, 4743283, 4743284, 4741830, 4742501, 4743246, 4743086, 4743087, 4743378, 4743379, 4741751] into sparse-4749909-L04200000199131547

Change-Id: I3054f66972baf0c1123b8f3557487b3f362ca05e
parents 8b10be2e 718eec54

AndroidManifest.xml

+0 −9
Original line number Diff line number Diff line
@@ -1983,15 +1983,6 @@ 
                android:value="com.android.settings.print.PrintJobSettingsFragment" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="DevelopmentSettings"

                  android:exported="true"

                  android:label="@string/development_settings_title"

                  android:targetActivity="Settings$DevelopmentSettingsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.development.DevelopmentSettings" />

        </activity-alias>



        <activity android:name=".development.AppPicker"

                  android:label="@string/select_application"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />

res/values-af/strings.xml

+25 −27

File changed.

Preview size limit exceeded, changes collapsed.

res/values-am/strings.xml

+7 −9

File changed.

Preview size limit exceeded, changes collapsed.

res/values-ar/strings.xml

+301 −303

File changed.

Preview size limit exceeded, changes collapsed.

res/values-az/strings.xml

+4 −6

File changed.

Preview size limit exceeded, changes collapsed.