packages_apps_Settings

Go to file

Bill Yi 8855449867 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877 -s ours am: 24a85bad6d -s ours am: 7504a741b7 -s ours am: 543247f2a9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1924c227415c3f42c9886097b883c6440473bd18

2020-08-20 17:23:46 +00:00

libs

…

protos

…

res

Give a long string some extra space am: dad3470cad

2020-08-20 16:23:09 +00:00

src/com/android/settings

Merge "Update settings together with frameworks/base"

2020-08-19 22:33:04 +00:00

tests

Merge "[Testing] Use AndroidJUnit4 instead in ApnPreferenceControllerTest"

2020-08-20 08:28:15 +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

…