app_Settings

Go to file

Treehugger Robot 29531e9296 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98 -s ours

am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

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

2022-06-17 20:07:25 +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-06-06 18:42:20 +00:00

src/com/android/settings

Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa