app_Settings

Go to file

Automerger Merge Worker f7c1c40604 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 5b84d06935 -s ours" into rvc-qpr-dev-plus-aosp am: dba49a339c -s ours am: 6d9bafb14f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I709e4bcf533ebf3402e7610184fb14b9afbba10c

2020-08-19 00:24:06 +00:00

libs

…

protos

…

res

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

2020-08-17 23:52:55 +00:00

src/com/android/settings

Merge "Don't put a null in a spannablestringbuilder"

2020-08-18 18:48:28 +00:00

tests

Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest"

2020-08-18 10:27:32 +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

…