app_Settings

Go to file

Bill Yi 3864fa5bd2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours am: 00216c3bc8 -s ours am: 85335be7a4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idb1b2dbaf3678815b2a67b165ae066f8c4a39505

2020-08-05 07:36:59 +00:00

libs

…

protos

…

res

Import translations. DO NOT MERGE ANYWHERE

2020-08-05 02:14:15 +00:00

src/com/android/settings

Merge "Update language to comply with Android's inclusive language guidance"

2020-08-04 18:52:54 +00:00

tests

Merge "Update language to comply with Android's inclusive language guidance"

2020-08-04 15:40:55 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "Revert "Initial setup for slot change receiver migration""

2020-07-21 06:01:24 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix the color-check-baseline checker error while repo upload

2020-07-24 13:25:30 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…