Bill Yi 1e3c0162cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f76efce0bf -s ours ...

am skip reason: contains skip directive

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

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

2024-11-27 10:56:09 +00:00

aconfig

Merge "Add aconfig flag on contacts default account settings in the app settings page." into main

2024-09-20 23:03:30 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Fix search for MMS Message

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

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future

2024-11-26 20:37:07 +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-11-26 05:54:19 -08:00

src/com/android/settings

Merge "Update comments to point to the new location of event.logtags." into main am: fa6413ed0b

2024-11-26 10:45:28 +00:00

tests

Merge ab/AP4A.240925.013 into aosp-main-future

2024-11-21 15:10:02 -08:00

.gitignore

Update .gitignore list

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

Android.bp

Move ObservablePreferenceFragment class

2024-09-13 20:39:59 +08:00

AndroidManifest.xml

Merge changes I28f7e3e6,I30450d13 into main

2024-09-19 07:38:44 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Update color-check-baseline.xml

2024-09-23 11:06:20 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%