Xin Li e52c18a41c [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: d61c2adf09 -s ours ...

am: 44ace71846 -s ours
am skip reason: subject contains skip directive

Change-Id: I2b9d869dd64767b498d75f3fe1c9a6746f943b56

2019-02-14 21:08:49 -08:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Deprecate EXCLUSIVE category from contextual_card_list.proto

2019-01-30 18:52:33 +08:00

res

Merge "Adjust layout padding for SlicePreference"

2019-02-15 00:06:59 +00:00

src/com/android/settings

Merge "Add null check for CarrierConfig"

2019-02-15 03:41:25 +00:00

tests

Merge "Add null check for CarrierConfig"

2019-02-15 03:41:25 +00:00

Android.mk

Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 am: 32fbf4740d

2019-02-13 10:43:46 -08:00

AndroidManifest.xml

Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627 am: 2ee5beaa32

2019-02-13 22:43:11 -08:00

CleanSpec.mk

Move Settings app to /product

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

color-check-baseline.xml

Make status bar become 80% of white in homepage.

2019-01-03 11:44:43 +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

Update owners

2018-12-19 20:24:23 -08: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

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%