app_Settings

Go to file

Treehugger Robot 3867542239 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours am: 966f8a889b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5eed324de754c4ab34a26002ce1ca122dde916f0

2020-09-05 15:17:20 +00:00

libs

…

protos

…

res

Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae

2020-09-01 05:00:04 +00:00

src/com/android/settings

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

2020-08-19 15:18:31 +00:00

tests

Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2

2020-08-17 20:25:53 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

[DO NOT MERGE] Add toggle for media resumption

2020-06-18 23:58:34 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Workaround for Recent app icon disappear

2020-06-16 17:30:32 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…