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

2013-04-02 09:18:02 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-04-01 19:36:05 +00:00

src/com/android/settings

am e427ccdc: am 8d9b07ed: Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev

2013-04-01 11:55:05 -07: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

Implement proper settings restrictions

2013-03-31 18:20:36 -07: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%