Jason Monk 718c84f121 resolve merge conflicts of 67e87fa to nyc-mr1-dev ...

Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178

2016-06-01 16:20:01 -04:00

res

Merge "Import translations. DO NOT MERGE" into nyc-dev

2016-06-01 15:14:12 +00:00

src/com/android/settings

resolve merge conflicts of 67e87fa to nyc-mr1-dev

2016-06-01 16:20:01 -04:00

tests

Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev

2016-05-23 11:59:19 +00:00

Android.mk

Create feature factory interface & initial impl.

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

AndroidManifest.xml

Merge "Fix some top-level settings not updating with language" into nyc-dev

2016-06-01 17:39:13 +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

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +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%