Automerger Merge Worker 08c72453e8 Merge changes from topic "am-a0cf920a5fac4d7a8c21e8f7c823c54b" ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 8287f6dd2e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: 6ddbc5e6be -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 3ecb491af2 -s ours

2023-06-21 06:52:48 +00:00

libs

…

protos

…

res

Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 2390428dd8

2023-06-20 17:48:39 +00:00

res-export

…

res-product

Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 94f5c7a913

2023-06-20 07:46:39 +00:00

src/com/android/settings

Merge "[BiometricsV2] Refactor EnrollingRfpsFragment"

2023-06-21 04:55:47 +00:00

tests

Merge "[BiometricsV2] Rewrite Activity to Kotlin"

2023-06-17 02:36:17 +00:00

.gitignore

…

Android.bp

Clean up Settings_srcs & Settings_manifest

2023-06-13 02:16:23 +00:00

AndroidManifest.xml

Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa

2023-06-15 07:19:57 +00:00

CleanSpec.mk

…

color-check-baseline.xml

…

NOTICE

…

OWNERS

Owners updates

2023-05-24 07:41:50 +00:00

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%