app_Settings

Go to file

SongFerng Wang 04bd163a85 [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours

am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

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

2022-03-25 17:33:33 +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 "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b

2022-03-23 06:34:55 +00:00

src/com/android/settings

Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b