app_Settings

Go to file

Bill Yi a9388a6f42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 15bb8d9aae -s ours am: 6e95702bd8 -s ours am: 005b4f57a7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id2b14f24bc37cfe68ccd4558550bd3e3f048515e

2021-08-13 22:53:23 +00:00

libs

…

protos

…

res

Merge "Increase character limit for translations"

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

src/com/android/settings

Merge "Update AlarmManager Global Settings String"

2021-08-13 22:00:30 +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

…