Dmitry Dementyev 2569925151 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours ...

am: f1fb452863

Change-Id: I074be985f7e09f1d7bac6936d7cadc25a9b8afba

2017-03-09 18:19:26 +00:00

res

Import translations. DO NOT MERGE

2016-10-26 21:04:20 -07:00

src/com/android/settings

resolve merge conflicts of 3964c51bf2 to nyc-dev

2017-03-09 18:19:10 +00:00

tests

Fix a broken TetherServiceTest.

2016-08-11 15:57:29 -07:00

Android.mk

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00:00

AndroidManifest.xml

Support displaying a dialog when Wi-Fi loses Internet access.

2016-09-15 23:43:00 +09: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 Night display settings

2016-07-08 11:48:02 -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%