Xin Li 3a8baab596 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d7a8e234e9 -s ours ...

am: 377369bd0d

Change-Id: Id7cae58babeb74b53bc047a2098fe05b06fbc066

2019-09-05 14:05:27 -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 "Updated security settings string." into qt-r1-dev

2019-09-05 13:17:36 -07:00

src/com/android/settings

Merge "[Settings] hide preferred network mode UI" into qt-r1-dev

2019-08-23 20:36:56 -07:00

tests

Merge "[Settings] hide preferred network mode UI" into qt-r1-dev

2019-08-23 20:36:56 -07:00

.gitignore

Create gitignore for Settings

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

Android.bp

Convert Settings to Android.bp

2019-05-29 14:45:30 -07:00

AndroidManifest.xml

Merge "Add UI for mainline modules licenses." into qt-dev

2019-06-28 16:56:04 +00:00

CleanSpec.mk

Move Settings app to /product

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

color-check-baseline.xml

Updating colors for dark theme

2019-06-06 16:48:29 -07: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%