Bill Yi 2f5200ea5a [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b16aba0dd -s ours am: 27e14db009 -s ours ...

am: 816e75fbc3  -s ours

Change-Id: I44155262f8685a56f4c678d9d2ca7d60e04707d4

2018-10-24 19:38:25 -07:00

libs

Use proto in contextualCard object

2018-10-10 10:35:51 -07:00

protos

Add contextual card proto libraries.

2018-10-10 10:14:07 -07:00

res

Merge "Refactor Cdma preference in ECM"

2018-10-23 23:53:29 +00:00

src/com/android/settings

Merge "Repro b/118398695"

2018-10-25 02:26:15 +00:00

tests

Merge "Add Battery slice in Contextual Settings Homepage"

2018-10-24 21:26:50 +00:00

Android.mk

Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3 am: 6767ce9d24

2018-10-12 03:42:13 -07:00

AndroidManifest.xml

Fix sound settings affinity

2018-10-19 15:19:11 -07:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Remove obsolete chart view widgets.

2018-10-08 14:18:50 -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

Add a rule to keep classes that implements CustomSliceable

2018-09-17 22:06:05 +08: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%