Automerger Merge Worker e18163b175 [automerger skipped] Import translations. DO NOT MERGE am: ee2c5a9df9 -s ours ...

am skip reason: subject contains skip directive

Change-Id: I708fe77de9b914609d00b208c0b1d3851273f9be

2019-12-15 05:34:42 +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

Merge "Revert "[Setting] Cleanup Unused SimSettings"" am: 487c94c11a am: 74a7a3cfb2

2019-12-14 01:23:03 +00:00

src/com/android/settings

Merge "Revert "[Setting] Cleanup Unused SimSettings"" am: 487c94c11a am: 74a7a3cfb2

2019-12-14 01:23:03 +00:00

tests

Merge "Update Bluetooth api" am: ff44a78145 am: 027a9244f1

2019-12-13 00:56:18 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Convert Settings to Android.bp

2019-05-13 13:42:01 -07:00

AndroidManifest.xml

Merge "[RadioInfo] Remove from Settings (into Telephony)" am: 0aac2dfab6 am: cfb6e23b21

2019-12-14 01:04:19 +00:00

CleanSpec.mk

Move Settings app to /product

2018-12-18 09:51:08 +00:00

color-check-baseline.xml

Updating colors for dark theme

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%