Bill Yi 39ef683d99 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 110375b901 -s ours am: 7fe805ba53 -s ours ...

am skip reason: contains skip directive

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

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

2024-09-11 23:41:26 +00:00

aconfig

Merge "Show a dialog if bluetooth key is missing when reconnecting" into main

2024-09-06 08:18:55 +00:00

libs

…

protos

Fix search for MMS Message

2024-07-30 11:34:24 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

2024-09-11 17:46:39 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-09-10 21:41:38 -07:00

src/com/android/settings

Merge "Fix errorprone issues" into main am: eb2e9e4776 am: bdd44e5242

2024-09-11 18:22:01 +00:00

tests

Merge "Fix errorprone issues" into main am: eb2e9e4776 am: bdd44e5242

2024-09-11 18:22:01 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Catalyst framework integration

2024-09-09 21:14:53 +08:00

AndroidManifest.xml

Merge "Fix the label of the Modes activity in Settings" into main

2024-09-11 00:11:16 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color_hook broken in repo upload caused by ag/27381753.

2024-06-04 12:35:56 +08:00

NOTICE

…

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

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

proguard.flags

Keep FakeFeatureFlagsImpl

2024-06-27 08:46:17 +00:00

TEST_MAPPING

Enable VPN2 package to Presubmit as the tests aren't flaky during local tests.

2024-05-21 08:49:04 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%