Sanket Padawe 7e6eec5b87 Resolve merge conflicts of b9e837bc78 to nyc-dev ...

+ Fix merge conflict fromm mm-wireless-dev to nyc-dev

Change-Id: I8a604cec65bbe5ed61262771c9fe0489798425ed

2016-02-29 10:48:51 -08:00

res

Import translations. DO NOT MERGE

2016-02-29 07:37:40 -08:00

src/com/android/settings

Resolve merge conflicts of b9e837bc78 to nyc-dev

2016-02-29 10:48:51 -08:00

tests

Import translations. DO NOT MERGE

2016-02-10 07:48:36 -08:00

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""

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

AndroidManifest.xml

Update suggestion text

2016-02-24 17:39:29 -05: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%