Matthew Fritze 71368b83b8 resolve merge conflicts of 21b446c to master ...

Change-Id: I38d1f88f03505d690ccd1739c42e8d34ef87890f

2016-07-20 18:28:39 -07:00

res

resolve merge conflicts of 21b446c to master

2016-07-20 18:28:39 -07:00

src/com/android/settings

Merge \\"Should not report unsuccessful attempt if pattern size < minimal size\\" into nyc-mr1-dev am: 9d83a9fbbb

2016-07-20 19:51:26 +00:00

tests

Import translations. DO NOT MERGE

2016-07-20 07:09:37 -07:00

Android.mk

Create feature factory interface & initial impl.

2016-04-13 13:02:38 -07:00

AndroidManifest.xml

Merge \"Color transforms are now color modes.\" into nyc-mr1-dev

2016-07-20 18:49:59 +00:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Ensure classes used via XML are kept by proguard

2016-07-06 12:19:10 +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%