packages_apps_Settings

Go to file

Automerger Merge Worker b88cae2c79 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours" into sc-qpr1-dev-plus-aosp am: 21893b0972 -s ours am: 54e1722352 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifd4eaf8132981f244632b1f9cda46628c05a86a2

2021-08-23 05:11:48 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-08-22 17:45:29 +00:00

src/com/android/settings

Merge "[Material Next] Accessibility gesture tutorial dialog" into sc-v2-dev am: f7db8d7ee4 am: 2fa8b94643

2021-08-20 22:10:23 +00:00

tests

…

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "[Material Next] Accessibility gesture tutorial dialog" into sc-v2-dev am: f7db8d7ee4 am: 2fa8b94643

2021-08-20 22:10:23 +00:00

CleanSpec.mk

…

color-check-baseline.xml

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…