Xin Li 56f13d5a1e [automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master am: fc53be7b56 -s ours ...

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

Change-Id: I74345f6fe80643fae680d46fd27d9c1b285e600f

2019-02-25 20:52:25 -08:00

libs

Update proto for contextual_card_list.

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

protos

Remove deprecated EXCLUSIVE field from proto

2019-02-18 16:25:23 +08:00

res

Merge changes I9f1edb0a,Iaba7077c

2019-02-26 04:00:13 +00:00

src/com/android/settings

Merge changes I9f1edb0a,Iaba7077c

2019-02-26 04:00:13 +00:00

tests

Merge changes I9f1edb0a,Iaba7077c

2019-02-26 04:00:13 +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 "Create settings screen for Notification Assistant"

2019-02-23 04:30:23 +00:00

CleanSpec.mk

Move Settings app to /product

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

color-check-baseline.xml

Remove all reference to settings_side_margin.

2019-02-21 10:18:00 -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%