Tom Hsu afd9e67e05 [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: 1c154f9197 am: 7c2d110559 ...

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

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

2022-05-05 10:28:27 +00:00

libs

…

protos

…

res

Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: 5f99fad806 am: 58b70b17f7 am: 705c447e92

2022-05-04 11:06:22 +00:00

src/com/android/settings

[Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: 1c154f9197 am: 7c2d110559

2022-05-05 10:28:27 +00:00

tests

Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 03a2775a32 am: e5effd7edf

2022-05-05 06:05:41 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: 79949be124

2022-05-03 08:14:55 +00: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%