The Android Automerger 52a801bce2 merge in master-release history after reset to master

2013-03-19 07:50:24 -07:00

res

Import translations. DO NOT MERGE

2013-03-18 11:26:14 -07:00

src/com/android/settings

am e6890387: Merge "Allow disabling both MTP and PTP." into jb-mr2-dev

2013-03-18 22:53:11 +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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%