app_Settings

Go to file

TreeHugger Robot 6ea42ffd33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dcd910ed06 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iedab78ba68a5eb7bfd4975bb1dc047737f21c98d

2020-08-19 16:54:10 +00:00

libs

…

protos

…

res

Increase char limit am: 11f8554405 am: 8baf14632c am: 043ec22d6e

2020-08-19 16:34:38 +00:00

src/com/android/settings

Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c am: ece108cc9a am: f00eba5b87

2020-08-19 15:41:28 +00:00

tests

Merge changes from topic "color_correction_b_148785841"

2020-08-19 07:51:41 +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

…