app_Settings

Go to file

Bonian Chen da5f4be369 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: eedfefab4b -s ours am: b82af15ea9 -s ours

am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

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

2022-04-07 00:45:50 +00:00

libs

Sticky placeholder and adjacent finish rule in Settings

2021-11-09 22:32:58 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master

2022-03-28 06:27:30 +00:00

src/com/android/settings

Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a