Xin Li 92fc138524 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" ...

am: d4716c1a62 -s ours
am skip reason: subject contains skip directive

Change-Id: If29e30a1516d869c647bb9634eb8c1d3b4b9b3f9

2019-02-20 11:06:41 -08:00

res

DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master

2019-02-14 00:03:58 -08:00

src/com/android/settings

Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master

2019-02-14 22:11:39 +00:00

tests

Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master

2019-02-14 22:11:39 +00:00

Android.mk

Make the Settings permission a required module

2019-01-14 15:50:28 +00:00

AndroidManifest.xml

Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master

2019-02-14 22:11:39 +00:00

CleanSpec.mk

Move Settings app to /product

2019-01-11 16:41:54 +00:00

color-check-baseline.xml

Update color-check-baseline.xml

2018-12-21 14:20:01 -08: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-08-28 11:48:56 -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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%