Rajeev Kumar 331a4459f0 resolve merge conflicts of ac0fd76521 to master ...

Change-Id: I260f92df29e737736e4c0f531656417a202ee607
Test: I solemnly swear I tested this conflict resolution.

2017-10-23 22:36:09 -07:00

res

Add strings to support multi-state vivid color management am: e1543a3895

2017-10-24 00:29:14 +00:00

src/com/android/settings

resolve merge conflicts of ac0fd76521 to master

2017-10-23 22:36:09 -07:00

tests

resolve merge conflicts of ac0fd76521 to master

2017-10-23 22:36:09 -07:00

Android.mk

Merge "Remove unnecessary core-oj library"

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

AndroidManifest.xml

Add FingerprintEnroll API

2017-10-19 11:54:25 -07: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%