Automerger Merge Worker 50d20369ae [automerger skipped] Import translations. DO NOT MERGE am: 250b9e7012 -s ours am: 90cb40e80c -s ours ...

am skip reason: subject contains skip directive

Change-Id: I0c32b44c220d21e85ab1cc26b467defc9e56beec

2020-01-16 11:49:41 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

res

Import translations. DO NOT MERGE

2020-01-15 19:56:31 -08:00

src/com/android/settings

Merge "Make contextual card count configurable."

2020-01-16 11:21:38 +00:00

tests

Merge "Make contextual card count configurable."

2020-01-16 11:21:38 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Include settings app compat config in the build.

2020-01-13 11:37:00 +00:00

AndroidManifest.xml

Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1"

2020-01-15 01:04:02 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Update the lint color check file.

2020-01-08 19:16:00 +08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

OWNERS

Change OWNERS

2019-07-12 16:35:12 +08:00

PREUPLOAD.cfg

Add the checkstyle_hook into PREUPLOAD.cfg

2019-10-14 21:03:17 +08:00

proguard.flags

Revert "Update proguard"

2019-02-06 15:44:40 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%