Jason Monk 71798b065b resolve merge conflicts of 67e87fa to nyc-mr1-dev am: 718c84f121 -s ours ...

am: b2af26dc9d

* commit 'b2af26dc9d2cef6d836877ec144ed04ea2b0b74a':

Change-Id: I0d0a33684ca649ba2e5a94ed26f47b9b68271cb4

2016-06-01 21:35:50 +00:00

res

Merge "Import translations. DO NOT MERGE"

2016-06-01 15:18:37 +00:00

src/com/android/settings

Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev am: df66d4abf0 am: 4080861e75

2016-06-01 19:54:06 +00:00

tests

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

2016-05-23 12:09:38 +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 am: ed70356506

2016-06-01 17:42:36 +00:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

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%