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

2013-04-25 07:50:08 -07:00

res

am 7200ae73: am 868acab2: Merge "Rename limited users to restricted profiles" into jb-mr2-dev

2013-04-24 15:01:02 -07:00

src/com/android/settings

am d8e88735: am d346a1ca: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev

2013-04-24 18:51:41 -07:00

tests

Fix Bluetooth enable dialog to match Android style guide.

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

Android.mk

Forcing the settings apk to be built with the zz_ZZ pseudolocale.

2013-04-11 13:32:39 -07:00

AndroidManifest.xml

Add support to display regulatory info from *#07#.

2013-04-23 13:06:54 -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%