Bill Yi 8c834259b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours ...

am skip reason: subject contains skip directive

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

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

2022-05-25 19:41:14 +00:00

libs

…

protos

…

res

Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 6c2ffc2220

2022-05-25 15:06:49 +00:00

src/com/android/settings

Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 6c2ffc2220

2022-05-25 15:06:49 +00:00

tests

Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 6c2ffc2220

2022-05-25 15:06:49 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Fix incorrect battery icon showing on the recent apps

2022-05-18 12:18:15 +08:00

CleanSpec.mk

…

color-check-baseline.xml

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%