Andrew Sapperstein 2524686c66 resolve merge conflicts of b0c58aa to master ...

Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b

2016-04-20 17:56:12 -07:00

res

Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6 am: 1c94e6d

2016-04-19 18:21:55 +00:00

src/com/android/settings

resolve merge conflicts of b0c58aa to master

2016-04-20 17:56:12 -07:00

tests

Add a deletion helper view for clearing space.

2016-04-15 09:06:32 -07:00

Android.mk

Create feature factory interface & initial impl.

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

AndroidManifest.xml

Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc am: 38ee923

2016-04-20 13:37:23 +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%