Lei Yu 2b976cce96 [automerger skipped] Merge "Update color-check-baseline.xml" am: 81cb8a2612 -s ours ...

am: 3461bd0644  -s ours

Change-Id: I6e510de1b75e2656e4f82727e2a9911f3e32d8d7

2018-12-27 13:49:35 -08:00

res

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

2018-12-11 15:24:05 -08:00

src/com/android/settings

Merge "Moved data settings to phone" am: bcd6a7db39

2018-12-20 19:13:21 -08:00

tests

Merge "Remove unused system properties" am: fd0426d438

2018-12-20 01:42:16 -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 master

2018-12-11 15:24:05 -08:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Move "About Phone" to bottom of Settings main IA, above "Tips & Support"

2018-11-09 11:24:48 +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 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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%