Lorenzo Colitti b01c080b08 resolve merge conflicts of f2801e4 to nyc-mr1-dev ...

Change-Id: I8a9723e8c070cd7f99c39fe5918335847f0b6248

2016-10-04 02:28:58 +09:00

res

resolve merge conflicts of f2801e4 to nyc-mr1-dev

2016-10-04 02:28:58 +09:00

src/com/android/settings

Merge "USB restriction is similar to media restriction" into nyc-mr1-dev

2016-10-01 00:16: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

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%