Treehugger Robot a842ed7c47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: 094103da6d -s ours ...

am skip reason: subject contains skip directive

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

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

2023-08-16 18:30:59 +00:00

libs

…

protos

Add a mechanism to log battery usage periodic job events

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

res

Merge "Basic structure for fingerprint enrollment." into main

2023-08-16 15:10:55 +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-03 18:10:32 -07:00

src/com/android/settings

Merge "Basic structure for fingerprint enrollment." into main

2023-08-16 15:10:55 +00:00

tests

Merge "Use resource processor for SettingsRoboTestStub" into main

2023-08-16 11:09:09 +00:00

.gitignore

…

Android.bp

Merge "Basic structure for fingerprint enrollment." into main

2023-08-16 15:10:55 +00:00

AndroidManifest.xml

Merge "Basic structure for fingerprint enrollment." into main

2023-08-16 15:10:55 +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

…

TEST_MAPPING

Enable presubmit biometrics unit tests

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

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%