app_Settings

Go to file

Weng Su 2ff9679b47 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -s ours am: 643ebcefe7 -s ours

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

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

Change-Id: I065e1ee3165d8daacff38036f28cfefb6a7d9cd2

2021-08-07 14:40:05 +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 "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4 am: 67518dac5e

2021-08-05 00:13:48 +00:00

src/com/android/settings

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