app_Settings

Go to file

Bill Yi 910530931f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours

am skip reason: subject contains skip directive

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

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

2022-06-06 19:19:06 +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 changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0