Bill Yi bb508ed01b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours am: 56d5a70aa0 -s ours am: 6c43cdc8fe -s ours ...

am skip reason: subject contains skip directive

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

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

2023-08-31 23:09:12 +00:00

aconfig

Add LocaleNotificaiton feature flag

2023-08-29 07:58:02 +00:00

libs

…

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

Merge "Remove Winscope tracing QS development tile" into main

2023-08-31 22:06:52 +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-08-30 19:05:16 -07:00

src/com/android/settings

Merge "Remove Winscope tracing QS development tile" into main

2023-08-31 22:06:52 +00:00

tests

Merge "Remove Winscope tracing QS development tile" into main

2023-08-31 22:06:52 +00:00

.gitignore

…

Android.bp

Merge "Fix theme differences between left/right pane problem" into main

2023-08-29 02:10:50 +00:00

AndroidManifest.xml

Merge "Remove Winscope tracing QS development tile" into main

2023-08-31 22:06:52 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Merge "Disabled state UI of Flash Notifications preview button" into udc-dev

2023-05-11 01:41:47 +00:00

NOTICE

…

OWNERS

Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main

2023-07-12 22:03:16 +00:00

PREUPLOAD.cfg

…

proguard.flags

Refine Settings proguard rules

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

TEST_MAPPING

Enable presubmit biometrics unit tests

2023-05-11 06:07:08 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%