app_Settings

Go to file

Hugh Chen aa1b04462a [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours am: 8e922b95f3 -s ours am: 999cccd462 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2b303f4454682a71f2640e5579d4425718e9c332

2021-06-28 07:51:48 +00:00

libs

…

protos

…

res

Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 6fbeadac34

2021-06-28 04:47:38 +00:00

src/com/android/settings

Merge "[Settings] fix for Wifi calling settings page crash"

2021-06-28 04:20:26 +00:00

tests

Merge "LegacyVpnPreferenceTest added for Vpn settings"

2021-06-28 04:13:38 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 6fbeadac34

2021-06-28 04:47:38 +00:00

CleanSpec.mk

…

color-check-baseline.xml

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…