app_Settings

Go to file

Automerger Merge Worker abb6377cd5 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: 69605d12d0 -s ours am: 6d103087f5 -s ours" into rvc-qpr-dev-plus-aosp am: 4996bc3703 -s ours am: a558cf0945 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia1f4f5e04be09d49bafb43862b63cbe86026e72e

2020-08-19 08:04:06 +00:00

libs

…

protos

…

res

Merge changes from topic "color_correction_b_148785841" am: f92160da4a

2020-08-19 08:03:44 +00:00

src/com/android/settings

Merge changes from topic "color_correction_b_148785841"

2020-08-19 07:51:41 +00:00

tests

Merge changes from topic "color_correction_b_148785841"

2020-08-19 07:51:41 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "Revert "Initial setup for slot change receiver migration""

2020-07-21 06:01:24 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix the color-check-baseline checker error while repo upload

2020-07-24 13:25:30 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…