Mark Salyzyn 94ab88228e resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp. ...

Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00

2015-12-28 10:49:04 -08:00

res

resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp.

2015-12-28 10:49:04 -08:00

src/com/android/settings

resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp.

2015-12-28 10:49:04 -08:00

tests

Import translations. DO NOT MERGE

2015-09-22 22:02:21 -07:00

Android.mk

Allow incremental builds for settings.

2015-04-27 21:16:03 +00:00

AndroidManifest.xml

Fix crashes in Settings

2015-10-16 10:13:53 -04: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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%