Xin Li 69db86bde6 Merge "[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours am: f0acd850fb -s ours ...

am: 5d382504c6 -s ours
am skip reason: subject contains skip directive

Change-Id: I041e994432297d067c5894ddd1a7db3745520c10

2019-05-09 22:23:42 -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 "Fix mirrored arrow issue for RTL" into qt-dev am: a096b6d1f1

2019-05-09 20:35:48 -07:00

src/com/android/settings

Merge "Display profile picker for content capture settings." into qt-dev am: f39ed1f432

2019-05-09 14:37:03 -07:00

tests

Merge "Fix robolectric test error" into qt-dev am: c617fa2e87

2019-05-09 18:15:07 -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 changes from topic "Face Intro Changes" into qt-dev am: 0f65b773be

2019-05-08 18:17:00 -07:00

CleanSpec.mk

Move Settings app to /product

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

color-check-baseline.xml

Make the selected importance more prominent

2019-05-03 19:31:19 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

OWNERS

Update Settings owners

2019-05-02 01:44:42 +00: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%