pkanwar 7fe0c25f77 resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp ...

Change-Id: I9213ec0dc937bd20ff705f4deb41c10a4e69c227

2016-05-05 18:53:08 -07:00

res

resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp

2016-05-05 18:53:08 -07:00

src/com/android/settings

resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp

2016-05-05 18:53:08 -07: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-19 23:01:49 +00: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-19 23:01:49 +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%