app_Settings

Go to file

TreeHugger Robot f8e4c546cc [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 688eccdf1f -s ours am: 07a060de51 -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/+/15212651

Change-Id: I27de176391c4c108ea9a51a0460421ad7edeeaa0

2021-08-08 15:07:24 +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