Jason Monk 2e2f19d2eb resolve merge conflicts of 0496ffa to master ...

Change-Id: I61589b7e9f1190e19d48dbb421541ebc2891ee82

2016-05-10 16:34:48 -04:00

res

resolve merge conflicts of b59dbf6 to master

2016-05-10 11:17:28 -07:00

src/com/android/settings

resolve merge conflicts of 0496ffa to master

2016-05-10 16:34:48 -04:00

tests

Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev

2016-04-21 17:27:16 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-13 13:02:38 -07:00

AndroidManifest.xml

Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd

2016-04-28 13:02:51 +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

Create feature factory interface & initial impl.

2016-04-13 13:02:38 -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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%