The Android Automerger 8b3dd7693e merge in master-release history after reset to master

2013-03-14 07:50:21 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-03-14 04:44:36 +00:00

src/com/android/settings

am 1b4c6c1c: am 93692c36: am 53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"

2013-03-14 06:15:40 +00:00

tests

Fix Bluetooth enable dialog to match Android style guide.

2012-11-20 18:21:44 -08:00

Android.mk

Remove guava dependency to speed up build.

2013-03-06 11:47:26 -08:00

AndroidManifest.xml

Give Wi-Fi Display settings split actionbar.

2013-02-20 12:35:16 -08:00

CleanSpec.mk

Add an empty CleanSpec.mk

2010-03-08 18:05:08 -08: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

Proguard fix: include notification settings fragment.

2013-02-22 13:17:39 -05:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%