Jason Monk 90bde71e20 resolve merge conflicts of f4ad443 to nyc-mr1-dev ...

Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7

2016-06-15 11:31:14 -04:00

res

Align text for conditions with text for other tiles.

2016-06-14 12:44:48 -07:00

src/com/android/settings

resolve merge conflicts of f4ad443 to nyc-mr1-dev

2016-06-15 11:31:14 -04:00

tests

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

2016-05-23 11:59:19 +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 16:51:09 +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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%