app_Settings

Go to file

Treehugger Robot 9cff47fcce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours am: 2d241c544d -s ours am: 52b60555b5 -s ours am: a2329d7450 -s ours am: 1db92597d7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3af44ec28ab861a1c6f46996ef2b10d40f045ef6

2020-09-05 15:59:49 +00:00

libs

…

protos

…

res

Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae am: 08e3e22ae0 am: d57b551b8d am: 36c1271234

2020-09-01 06:21:51 +00:00

src/com/android/settings

Merge "Fix settings crash"

2020-09-03 00:46:02 +00:00

tests

Merge "Fix settings crash"

2020-09-03 00:46:02 +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

…