Justin Klaassen 1863ffc982 resolve merge conflicts of 67b3a94 to master ...

Change-Id: I8fabdf019fea12793c54745390ed4669118548d0

2016-07-08 14:40:55 -07:00

res

resolve merge conflicts of 67b3a94 to master

2016-07-08 14:40:55 -07:00

src/com/android/settings

resolve merge conflicts of 67b3a94 to master

2016-07-08 14:40:55 -07:00

tests

Import translations. DO NOT MERGE

2016-07-05 19:05:09 -07:00

Android.mk

Create feature factory interface & initial impl.

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

AndroidManifest.xml

resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp

2016-07-06 13:28:19 -07: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

Ensure classes used via XML are kept by proguard

2016-07-06 12:19:10 +00: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%