Jordan Liu 5ab9a91b9b resolve merge conflicts of 7d59c48038 to qt-dev-plus-aosp ...

am: 3a4412ff41

Change-Id: I6234401143c28810e023c8151a3256dd211df6ea

2019-04-05 16:29:31 -07:00

libs

Update proto for contextual_card_list.

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

protos

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

res

Merge "Add Settings icons needed for theme overlaying." into qt-dev am: 41f0a69b76

2019-04-05 11:58:18 -07:00

src/com/android/settings

Merge changes Ib80d68d6,I0d57d5b2 into qt-dev am: e323b40f4e

2019-04-05 16:20:08 -07:00

tests

Merge changes Ib80d68d6,I0d57d5b2 into qt-dev am: e323b40f4e

2019-04-05 16:20:08 -07:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.mk

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

AndroidManifest.xml

Merge "Add a flashlight handler activity to support indexability."

2019-04-03 20:48:23 +00:00

CleanSpec.mk

Move Settings app to /product

2018-12-18 09:51:08 +00:00

color-check-baseline.xml

Add fp icon with background shape

2019-03-22 12:06:36 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%