Jason Monk 472b7912d2 resolve merge conflicts of 7f7092c to nyc-mr1-dev ...

am: aaaa236cec

Change-Id: Ib4ee0ed91ac5951f67698ddc459bc0031eed3160

2016-06-08 20:22:18 +00:00

res

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

2016-06-08 15:28:48 -04:00

src/com/android/settings

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

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

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

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%