Mahaver Chopra 58a2e0ec9c Merge "Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314 am: 49a3cc0fb6" into nyc-mr1-dev-plus-aosp ...

am: 3d028b1de2

* commit '3d028b1de28ae324071e8d3c2567fb44514914e6':

Change-Id: I0bce4b9a3a7a9738f200fd98455a2a6ec34ab154

2016-05-04 14:45:04 +00:00

res

resolve merge conflicts of d5b3a5d to nyc-mr1-dev am: 8f14564787

2016-05-04 10:46:45 +00:00

src/com/android/settings

Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314 am: b735c1baf7

2016-05-04 14:45:01 +00: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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%