Julia Reynolds 092909f871 Merge "Merge "Fix NPE in user settings." into nyc-dev am: e69d754865 am: 9f6de156ca" into nyc-mr1-dev-plus-aosp ...

am: 82b2f3ece7

* commit '82b2f3ece7dc22efcef2cda913479b4c4c15fa1a':

Change-Id: I9a4ab234eda388695f10febc251b595a26b09c62

2016-04-29 14:39:55 +00:00

res

Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351 am: bf4e0306bc

2016-04-29 13:39:09 +00:00

src/com/android/settings

Merge "Fix NPE in user settings." into nyc-dev am: e69d754865 am: 1d5fbf6672

2016-04-29 14:39:55 +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-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%