Alexey Polyudov 5d409ace19 resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp ...

Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88

2017-02-02 11:11:29 -08:00

res

Import translations. DO NOT MERGE

2017-01-30 23:10:41 -08:00

src/com/android/settings

resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp

2017-02-02 11:11:29 -08:00

tests

Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd

2017-01-19 15:20:26 +00:00

Android.mk

Create feature factory interface & initial impl.

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

AndroidManifest.xml

Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am: fb0ab547c2 am: e10af2add7

2017-01-31 19:24:12 +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%