Bill Yi 685859224c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 072fc7f175 -s ours ...

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25778819

Change-Id: Id346b3475bc9d8a3f12563780d0a2f8cc5c93c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2024-01-03 17:49:28 +00:00

aconfig

Merge "Require authentication for changing USB preferences." into main

2024-01-03 15:19:21 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Update content description

2024-01-03 15:00:20 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-12-26 16:28:57 -08:00

src/com/android/settings

Merge "Require authentication for changing USB preferences." into main

2024-01-03 15:19:21 +00:00

tests

Merge "Require authentication for changing USB preferences." into main

2024-01-03 15:19:21 +00:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

Support reset IMS stack in Reset Mobile Network flow

2023-12-22 10:33:46 -06:00

AndroidManifest.xml

Add ResetMobileNetworkSettingsActivity into Settings

2023-12-21 16:37:19 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +08:00

NOTICE

…

OWNERS

Update Settings OWNERS file

2023-10-26 19:54:52 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

TEST_MAPPING

Revert "Adding screenshot tests to postsubmit."

2023-12-11 23:31:44 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%