Jason Monk 6e20cd86b2 resolve merge conflicts of 4038f15 to master ...

Change-Id: Ifae7060ab23ad7619a5fdd01315a2d3e7c8a3845

2016-03-30 12:58:09 -04:00

res

resolve merge conflicts of 4038f15 to master

2016-03-30 12:58:09 -04:00

src/com/android/settings

resolve merge conflicts of 4038f15 to master

2016-03-30 12:58:09 -04:00

tests

Import translations. DO NOT MERGE

2016-03-18 20:52:22 -07:00

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""

2016-02-16 17:22:08 -08:00

AndroidManifest.xml

Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev

2016-03-28 22:33:41 +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

Reworks lock screen flows.

2016-02-09 11:58:12 -08: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%