Andreas Gampe ada98fb5b3 resolve merge conflicts of d30af7c to master ...

Change-Id: I3484e0e6c2a092f05539af569a9d9131f006ecf1

2016-08-30 20:36:50 -07:00

res

resolve merge conflicts of d30af7c to master

2016-08-30 20:36:50 -07:00

src/com/android/settings

resolve merge conflicts of d30af7c to master

2016-08-30 20:36:50 -07:00

tests

Merge "Avoid JUnit4 collision in android-support-test, mockito-target"

2016-08-25 20:42:29 +00:00

Android.mk

Build with AAPT2

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

AndroidManifest.xml

Merge "remove duplicate permissions"

2016-08-18 23:25:04 +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%