Fan Zhang 39d2e1f916 resolve merge conflicts of 057f4ae to master ...

Change-Id: I609b04b174195b2396ee5918990b03d737ad0067

2016-06-17 15:40:48 -07:00

res

resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp

2016-06-17 18:55:31 +00:00

src/com/android/settings

resolve merge conflicts of 057f4ae to master

2016-06-17 15:40:48 -07: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-13 13:02:38 -07:00

AndroidManifest.xml

Merge \"Use GLIF theme for Settings > Security > Screen lock\" into nyc-mr1-dev

2016-06-16 22:10:10 +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-13 13:02:38 -07:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%