app_Settings

Go to file

Hugh Chen 18e7bf55cd [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: a11ed686d4 -s ours am: bc51750bf1 -s ours am: fe804966c0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I222c09df0e4cb4587416bf75fe22997498756920

2021-06-28 06:36:55 +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

Update the image for Fingerprint Finish page

2021-06-21 17:20:00 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…