app_Settings

Go to file

Bill Yi fb5d0a6e1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours am: 4d68983581 -s ours am: c303aa8b0c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0eb46287f907ebd73ced548aba065c36e3155d90

2021-08-13 20:12:16 +00:00

libs

…

protos

…

res

Merge "Increase character limit for translations"

2021-08-13 20:11:03 +00:00

src/com/android/settings

Merge "Parse AM Constants to get keys:value for Dialog"

2021-08-13 16:46:31 +00:00

tests

Merge "Remove refs of isSeparateProfileChallengeAllowed"

2021-08-13 15:49:11 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: 7b6c01cf2c

2021-08-09 13:01:10 +00:00

CleanSpec.mk

…

color-check-baseline.xml

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…