Dmitry Dementyev 3a5e567ab9 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c ...

am: 5c4276a258

Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b

2017-03-08 19:11:13 +00:00

res

Import translations. DO NOT MERGE

2016-01-12 16:44:04 -08:00

src/com/android/settings

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c

2017-03-08 19:11:13 +00:00

tests

Import translations. DO NOT MERGE

2016-01-12 16:44:04 -08:00

Android.mk

Allow incremental builds for settings.

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

AndroidManifest.xml

Fix issue #23037899: Support for Battery Optimization permission + Dialog

2015-08-10 17:07:14 -07: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%