Dmitry Dementyev 3b5b2d6d20 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f ...

am: 8c5c5b5cec

Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750

2017-03-09 18:22:11 +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 am: 0f04a5a93f

2017-03-09 18:22:11 +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%