app_Settings

Go to file

TreeHugger Robot 6915e70c07 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 421e0c398c -s ours am: b84efe7136 -s ours

am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I00e0fe40bc913cf49d9d8df5f0a36757460a3d57

2021-08-09 13:35:02 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -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 sc-dev

2021-08-05 05:02:21 +00:00

src/com/android/settings

Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: 0b705abada am: 8d0ad43149