Xin Li a817ea5e80 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" ...

am: 889a8a3757  -s ours

Change-Id: Ide998fc70c7beb72b1bcf878783a5429268d1aeb

2018-12-13 13:09:45 -08:00

res

DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

2018-12-10 15:12:59 -08:00

src/com/android/settings

DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

2018-12-10 15:12:59 -08:00

tests

DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

2018-12-10 15:12:59 -08:00

Android.mk

Remove explicit dependency on bouncycastle

2018-10-11 17:02:36 +01:00

AndroidManifest.xml

DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

2018-12-10 15:12:59 -08:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

DO NOT MERGE Fix color_lint errors

2018-08-28 17:18:49 +00: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 16:35:52 -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%