Lorenzo Colitti bb529c267d Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev ...

am: 365d95b69a

Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a

2016-10-06 20:27:51 +00:00

res

resolve merge conflicts of f2801e4 to nyc-mr1-dev

2016-10-06 20:27:49 +00:00

src/com/android/settings

Prevent monkey tests from crashing with race conditions

2016-10-06 20:27:36 +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

DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent

2016-09-28 15:24:14 +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%