Bill Yi 093c8e49a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours am: f78ed7078e -s ours ...

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

Change-Id: I5e248c36376097e7399d6454c14f9c1e127c2160

2019-05-30 17:56:08 -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 "String update." into qt-r1-dev am: b471e2439c

2019-05-30 16:48:58 -07:00

src/com/android/settings

Merge "Add slice uri to slice index db"

2019-05-31 00:02:25 +00:00

tests

Add slice uri to slice index db

2019-05-30 16:47:31 -07:00

.gitignore

Create gitignore for Settings

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

Android.bp

Convert Settings to Android.bp

2019-05-13 13:42:01 -07:00

AndroidManifest.xml

Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034 am: 55ac2d75fc

2019-05-29 13:37:43 -07:00

CleanSpec.mk

Move Settings app to /product

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

color-check-baseline.xml

Revert "Revert "Make subsettings display edge-to-edge""

2019-05-14 13:48:12 -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%