app_Settings

Go to file

Weng Su b315686a50 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours am: a51cf93712 -s ours

am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: Ic6c2f6e4ef98ad685844ab2dbc99e821de8fa912

2021-08-07 14:40:21 +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