Dmitry Dementyev 0fb3d55e3a 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 am: 2569925151 am: efb9f74486 ...

am: d5f3ae5cac

Change-Id: Iacd8197fe2d48921a7b5adc71298ae8a00bb871d

2017-03-09 18:29:27 +00:00

res

Import translations. DO NOT MERGE

2017-02-22 08:50:31 -08:00

src/com/android/settings

resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20

2017-03-09 18:29:12 +00:00

tests

DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent

2016-09-28 15:24:14 +00:00

Android.mk

Create feature factory interface & initial impl.

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

AndroidManifest.xml

Ignore orientation change to preserve ApnEditor.

2017-02-08 18:04:24 +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 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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%