app_Settings

Go to file

Xin Li 35cf5330a9 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours

am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

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

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

2022-04-03 07:11:38 +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