Xin Li 33fa441a86 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours am: 4f83509810 ...

am: a038fb9044  -s ours

Change-Id: Ibfdba393783ac392dde8a42418b3cf8bfc8e34ff

2017-12-08 03:35:08 +00:00

res

Merge "Add controllers for default app shortcut preferences."

2017-12-08 02:20:11 +00:00

src/com/android/settings

Merge "Add controllers for default app shortcut preferences."

2017-12-08 02:20:11 +00:00

tests

Merge "Add controllers for default app shortcut preferences."

2017-12-08 02:20:11 +00:00

Android.mk

Depend settings on slices in the support library

2017-12-06 08:19:07 -08:00

AndroidManifest.xml

Add feature flag for battery settings page.

2017-12-05 13:15:13 -08:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Hook up lint color check to settings

2017-09-15 11:45:21 -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

Enable the color lint check

2017-09-18 17:01:23 -07:00

proguard.flags

Merge "Depend settings on slices in the support library"

2017-12-08 00:51:19 +00: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%