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

2013-04-19 07:50:09 -07:00

res

am 78c7c3fa: am 9e7a84e2: Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev

2013-04-18 18:05:24 -07:00

src/com/android/settings

am c19a82a3: am b5b541a5: Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev

2013-04-18 20:09:32 -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

Fix issue #8647812: Hide app ops choice from settings shortcut

2013-04-18 15:07:19 -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%