app_Settings

Go to file

Weng Su a51cf93712 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -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: I5f37094049ff33de6881fd9ff6645d2143fbc897

2021-08-07 14:26:50 +00:00

libs

…

protos

…

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: fd115c5db2

2021-08-07 00:39:30 +00:00

tests