Pavlin Radoslavov c3865601e8 resolve merge conflicts of 8fa3d44 to nyc-mr1-dev am: 3d4a586b80 ...

am: 86f77ab1e2

* commit '86f77ab1e2287f0221d35aef445592815d8d54ce':

Change-Id: Iab9627f1771abad8357b062816ce30ff8c49f76b

2016-05-07 05:32:50 +00:00

res

Merge "Update support email/chat display string." into nyc-mr1-dev am: 6d2dd23f85

2016-05-06 16:02:47 +00:00

src/com/android/settings

Merge "Implemented onRestrictPowerChanged()." into nyc-dev am: f135ad5186 am: 51ccb04e01

2016-05-06 23:46:08 +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%