Automerger Merge Worker 7c3a0483a7 Merge changes from topic "am-f5e1ab0936be49f5be84d3c326e7f8fc" ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6f09916f9d -s ours am: 3512ebb5cd -s ours am: 773f48bac4 -s ours am: 1856648ca3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095 -s ours am: 0890e485b7 -s ours am: 7ed996df9b -s ours am: d385d2f837 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da27 -s ours am: 99d07e12da -s ours am: 8cbbe62278 -s ours am: b325ba1cc0 -s ours

2022-07-05 02:22:02 +00:00

libs

Use androidx.window from prebuilt.

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

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-07-01 04:32:33 +00:00

src/com/android/settings

Merge "Add test cases for highlight Preference click behavior"

2022-07-04 13:08:53 +00:00

tests

Merge "Add test cases for highlight Preference click behavior"

2022-07-04 13:08:53 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

2022-05-30 01:58:25 +08:00

AndroidManifest.xml

Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35

2022-06-22 19:43:37 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Clean up unused string resource sync_plug

2022-06-01 18:43:10 +08:00

NOTICE

…

OWNERS

Add ykhung to the Settings Owners file

2022-06-24 05:58:57 +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%