Automerger Merge Worker 51b13dd95b Merge changes from topic "am-48b99c33710f4307b5bcefa2db7cb9a2" into tm-d1-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: 7d9636054e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: 1ad8ccd199 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 72a681dbe4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: a658060c06 -s ours

2022-06-09 03:46:28 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-21 00:18:55 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2022-06-07 07:29:07 -07:00

src/com/android/settings

Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 8425062cef

2022-06-09 02:43:01 +00:00

tests

Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 8425062cef

2022-06-09 02:43:01 +00:00

.gitignore

…

Android.bp

Use androidx.window from prebuilt.

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

AndroidManifest.xml

Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0

2022-06-02 04:01:11 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color lint

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

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +08:00

proguard.flags

Import the window extension libary in the Settings app

2021-08-19 17:23:11 +08:00

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%