app_Settings

Go to file

TreeHugger Robot 68f80bf14f [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: b1119ffc7c -s ours am: 0ae43531ef -s ours am: 2d1e24e446 -s ours am: c48d797307 -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: I53fb2314ba51b27650799f4ac278f8d654e8e8f8

2021-08-08 14:21:54 +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: 0b705abada am: 8d0ad43149

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

tests