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

2013-04-16 07:50:06 -07:00

res

Import translations. DO NOT MERGE

2013-04-15 11:15:51 -07:00

src/com/android/settings

am d56e4ad7: am 1a72d9c4: Merge "Remove old KeyStore API call sites" into jb-mr2-dev

2013-04-15 13:52:56 -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

Embed the app restrictions fragment in the dual-pane settings.

2013-04-11 18:21:07 -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%