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

am: 718c84f121  -s ours

* commit '718c84f121c5c5237d346596f1d755e3d45f8d6a':

Change-Id: I487d39f0c62a9f028262cd36b255583411649e7b

2016-06-01 21:17:27 +00:00

res

Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156

2016-06-01 09:48:27 +00:00

src/com/android/settings

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

2016-06-01 18:57:16 +00:00

tests

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

2016-05-23 12:03:44 +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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%