Jeff Sharkey 2fa5c2645e resolve merge conflicts of 071352de9e to master. ...

Change-Id: Ib777927fd479fcb567d005910930fda7354865d0

2015-10-20 16:04:59 -07:00

res

Import translations. DO NOT MERGE

2015-10-19 21:22:01 -07:00

src/com/android/settings

resolve merge conflicts of 071352de9e to master.

2015-10-20 16:04:59 -07:00

tests

Import translations. DO NOT MERGE

2015-09-25 14:12:22 -07:00

Android.mk

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AndroidManifest.xml

am 6d85d168: am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev

2015-10-16 16:56:40 +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

Add option to reset network settings to factory

2015-03-09 13:18:50 -07: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%