Matthew Fritze 2a11158392 [automerger skipped] Merge "Return null when setting can't be changed." into pi-dev am: c7b90ee998 ...

am: 9c49a3a20d  -s ours

Change-Id: I14fa7dc962384c564ad9ff1c96528b40b7bbb31b

2018-05-23 16:03:41 -07:00

res

Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev am: e0e49140d2

2018-05-23 16:01:21 -07:00

src/com/android/settings

Merge "Clear indexing before adding all Slices" into pi-dev am: 842ea91baa

2018-05-23 16:02:00 -07:00

tests

Merge "Clear indexing before adding all Slices" into pi-dev am: 842ea91baa

2018-05-23 16:02:00 -07:00

Android.mk

Migrate Settings to androidx.

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

AndroidManifest.xml

Merge "Update music, notifications, device information, and movies icons" into pi-dev am: 7ecbfd23f2

2018-05-21 20:55:58 -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

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%