Beverly Tai 451eeaa08a [automerger skipped] Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev am: 49499bcb06 ...

am: e493237128  -s ours

Change-Id: I1ea337c1a4ac4b50fcc4cb336987179ba90f7307

2018-05-11 16:16:10 -07:00

res

Merge "Add call volume in sound settings" into pi-dev am: b46389a588

2018-05-11 15:44:53 -07:00

src/com/android/settings

Merge "Rename settings category." into pi-dev am: a44d07c10d

2018-05-11 16:01:38 -07:00

tests

Merge "Rename settings category." into pi-dev am: a44d07c10d

2018-05-11 16:01:38 -07:00

Android.mk

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

AndroidManifest.xml

Merge changes Ic9d1b08c,Id6db9ce2,I7b980218

2018-05-11 20:33:10 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Update color whitelist for check color repohook

2018-04-02 11:32:06 -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

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

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

proguard.flags

Migrate Settings to androidx.

2018-04-20 12:52:29 -07: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%