Philip P. Moltmann afe6320d70 resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp ...

Test: built
Change-Id: I156db22c13da98bce0077b2acb8d9f1a3d2ce406

2017-02-14 09:51:34 -08:00

res

Import translations. DO NOT MERGE

2017-02-12 23:02:41 -08:00

src/com/android/settings

resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp

2017-02-14 09:51:34 -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 "Remove Bluetooth autoconnect on dock" am: b65c7fc810 am: e7d5b13f53

2017-02-10 18:20:28 +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%