Maurice Lam b8cf5a03a4 resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302 am: 0e1c486e74 ...

am: c03cf0092e  -s ours

Change-Id: Ie9d2e04136be07b90bdb49f4fcceb259c95dee4a

2017-10-16 21:43:55 +00:00

res

Update tile limit for Sound settings. am: 893bdba206

2017-10-15 05:33:47 +00:00

src/com/android/settings

Merge "Restore state when activity is destroyed"

2017-10-16 17:15:29 +00:00

tests

Merge "Introduce FreeformWindowsPreferenceController"

2017-10-16 17:15:17 +00:00

Android.mk

Merge "Remove unnecessary core-oj library"

2017-09-26 01:18:50 +00:00

AndroidManifest.xml

Merge "Move ManageApplications to sub package and remove dead code"

2017-10-12 22:46:43 +00: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

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +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%