app_Settings

Go to file

Bonian Chen f95effca60 [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -s ours am: 3c651042ba -s ours am: 5305cceda7 -s ours am: 353289122c -s ours am: 60ead8796f -s ours am: d56011040a -s ours

am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233 is already in history

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

Change-Id: I73314b4e3c00bac883f72c6132302ea0227bff5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-04-07 02:03:35 +00:00

libs

Update new API for checking the embedding status

2022-01-12 15:00:07 +08:00

protos

[Settings] Code refactor - NetworkModePreference

2022-03-19 10:46:06 +08:00

res

Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc am: ba369cbb31

2022-04-06 10:21:10 +00:00

src/com/android/settings

Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21"