app_Settings

Go to file

Bonian Chen 42d2e3bd6e [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours am: 351e22f8e2 -s ours am: 79238cbd50 -s ours am: c613394e88 -s ours am: 596513cbc5 -s ours

am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f is already in history

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

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

2022-04-07 01:17:33 +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-21 00:18:55 +00:00

res

Merge "Update framework strings for the security page." into tm-dev

2022-04-06 09:25:15 +00:00

src/com/android/settings

Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod