app_Settings

Go to file

Bill Yi 194420e2e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours am: deb6e762e1 -s ours am: 8220a53851 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I581a47b54ec566682308361e1c3e4e3146e57b94

2021-07-16 16:02:03 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-07-16 14:52:12 +00:00

src/com/android/settings

Merge "Fix the problem that the SIM status and IMEI after the "Build number"."

2021-07-16 12:59:17 +00:00

tests

Fix the problem that the SIM status and IMEI after the "Build number".

2021-07-16 19:44:25 +08:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "Add comment to AndroidManifest" into sc-dev am: 3bd14d2433 am: 86928d4f6a

2021-07-06 08:09:20 +00:00

CleanSpec.mk

…

color-check-baseline.xml

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…