Beverly 76507e06b6 [automerger skipped] Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev am: cf845f365c ...

am: 9c6ccfbb4a  -s ours

Change-Id: Ie2482ef0da93306300b1c15e6a1cec8fff4d43b5

2018-05-18 15:58:19 -07:00

res

Merge changes from topic "tel-debug-pi-dev-plus-aosp" into pi-dev-plus-aosp

2018-05-18 15:18:27 -07:00

src/com/android/settings

Merge changes from topic "tel-debug-pi-dev-plus-aosp" into pi-dev-plus-aosp

2018-05-18 15:18:27 -07:00

tests

Merge "Add controller to show the summary"

2018-05-18 19:34:48 +00:00

Android.mk

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

AndroidManifest.xml

Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev am: ef088843ae

2018-05-17 12:25:28 -07:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Fix color lint baseline. am: 76a0ef6adb

2018-05-18 14:39:57 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

OWNERS

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%