Automerger Merge Worker c376a14db6 Merge changes from topic "am-9133789c405d40309ee5fd09c8a75e13" into tm-qpr-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255 -s ours am: f4cd4b3e68 -s ours am: 26c64d0ffe -s ours am: 61f8ab9027 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc -s ours am: 917e5c6946 -s ours am: 3792be9679 -s ours am: 48018d069f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284 -s ours am: 76e5357179 -s ours am: f924935a30 -s ours am: b649de8a4e -s ours

2022-07-01 02:12:21 +00:00

libs

Use androidx.window from prebuilt.

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

protos

…

res

Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: 93f79d6774

2022-06-30 19:31:30 +00:00

src/com/android/settings

Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 0e4e512d7b

2022-06-30 05:37:16 +00:00

tests

Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: e30a71787e

2022-06-29 17:37:37 +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

Fix color lint

2022-04-11 20:40:18 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%