Jason Monk 359c8343dd Merge \"resolve merge conflicts of f4ad443 to nyc-mr1-dev\" into nyc-mr1-dev ...

am: b2e2007766

Change-Id: I1c135d7ff2977d5f5f5855e8fa7649303deef565

2016-06-15 16:42:04 +00:00

res

Merge \"Remove forum link from support tab.\" into nyc-mr1-dev

2016-06-15 16:17:20 +00:00

src/com/android/settings

Merge \"resolve merge conflicts of f4ad443 to nyc-mr1-dev\" into nyc-mr1-dev

2016-06-15 16:42:04 +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 \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev

2016-06-14 17:00:56 +00: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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%