Tom O'Neill 01af0f21a9 Merge commit '1542f9c7' into manualmerge ...

Change-Id: I6cb2a52ecb587bb3437ced58a404a2c028a185d9

2015-06-04 11:52:58 -07:00

res

am f680c691: am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev

2015-06-04 16:43:08 +00:00

src/com/android/settings

am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev

2015-06-04 16:04:13 +00:00

tests

am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev

2015-05-19 10:25:58 +00:00

Android.mk

Allow incremental builds for settings.

2015-04-27 21:16:03 +00:00

AndroidManifest.xml

Display softKeyboard when entering pin for pairing BT device.

2015-06-03 18:47:25 -07: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

Add option to reset network settings to factory

2015-03-09 13:18:50 -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%