Robert Greenwalt 1bd411f64a resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp am: 89b8babe6a ...

am: 69118dc9b1

Change-Id: I99d1b094d3de31905d1a72636146794c5ff00334

2016-06-13 20:14:29 +00:00

res

Merge \\\"Remove \\\'You can choose to either trust or remove this certificate\\\' from Check certificate dialog\\\" into nyc-dev am: 86c9894f04 am: 8532049946

2016-06-13 17:52:25 +00:00

src/com/android/settings

resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp am: 89b8babe6a

2016-06-13 20:14:29 +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-13 13:02:38 -07:00

AndroidManifest.xml

resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp

2016-06-08 15:28:48 -04: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

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%