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

2013-05-01 07:50:31 -07:00

res

am 60167266: am f162efee: Prompt to set a screen lock when adding a restricted profile

2013-04-30 08:54:00 -07:00

src/com/android/settings

am 0c3cc878: am 18c4317b: Show correct A2DP connection status in Bluetooth settings.

2013-04-30 17:18:08 -07:00

tests

Fix Bluetooth enable dialog to match Android style guide.

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

Android.mk

resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp

2013-04-29 23:30:40 -07:00

AndroidManifest.xml

Fix the title of the fragments of the personal dictionary settings

2013-04-30 16:08:00 +09: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%