Jorim Jaggi bbf6e5e0c5 resolve merge conflicts of 4c839a5 to master ...

Change-Id: Ie02e2b015c03512615fa25a0f4f0e955fd6910be

2016-08-02 22:26:55 +02:00

res

resolve merge conflicts of 4c839a5 to master

2016-08-02 22:26:55 +02:00

src/com/android/settings

resolve merge conflicts of 4c839a5 to master

2016-08-02 22:26:55 +02:00

tests

VpnSettings stub unit tests

2016-07-28 12:45:03 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00:00

AndroidManifest.xml

Offer trampoline to help articles. am: 4f425c890b

2016-07-26 22:16:03 +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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%