Automerger Merge Worker 5437a80536 Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e ...

Change-Id: Ia6cd10ee5a8d78f6002874f69d08ed53a3013572

2020-02-05 00:07:43 +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-29 12:59:30 -08:00

src/com/android/settings

Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e

2020-02-05 00:07:43 +00:00

tests

Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f

2020-02-04 10:51:31 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

AndroidManifest.xml

Merge "Track system server permission change" am: 2cf89ae027 am: 52b3ad3249

2020-01-06 21:20:54 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Updating colors for dark theme

2019-06-06 16:48:29 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Update Settings owners

2019-05-02 01:44:42 +00:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Revert "Update proguard"

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

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%