Jason Monk 7eda07bc5f resolved conflicts for e0d175ed to master ...

Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b

2015-09-23 18:55:44 -04:00

res

resolved conflicts for e0d175ed to master

2015-09-23 18:55:44 -04:00

src/com/android/settings

resolved conflicts for e0d175ed to master

2015-09-23 18:55:44 -04:00

tests

Import translations. DO NOT MERGE

2015-09-18 10:37:08 -07:00

Android.mk

Allow incremental builds for settings.

2015-04-24 14:35:02 -07:00

AndroidManifest.xml

am 479db35a: am f2ae4cb7: am 12b06cb6: am 7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev

2015-09-22 20:05:39 +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%