Daniel Nishi a2e0824b26 resolve merge conflicts of a4e3842 to master ...

Change-Id: Ia52171f3cfa0bcb73c6a4d23122ef8ad9025e807

2016-09-28 13:20:27 -07:00

res

resolve merge conflicts of a4e3842 to master

2016-09-28 13:20:27 -07:00

src/com/android/settings

resolve merge conflicts of a4e3842 to master

2016-09-28 13:20:27 -07:00

tests

Merge "Fix robolectric tests"

2016-09-27 23:25:33 +00:00

Android.mk

Build with AAPT2

2016-08-17 10:19:00 -07:00

AndroidManifest.xml

Merge "Provide fingerprint options for SET_NEW_PASSWORD intent"

2016-09-27 21:04:21 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -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

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%