Alex Klyubin 8059e00767 resolved conflicts for merge of 5d21820a to jb-mr2-dev ...

Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31

2013-06-07 15:31:11 -07:00

res

Import translations. DO NOT MERGE

2013-06-04 11:56:59 -07:00

src/com/android/settings

resolved conflicts for merge of 5d21820a to jb-mr2-dev

2013-06-07 15:31:11 -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

Remove wifi scan-always dialog.

2013-05-13 11:39:08 -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%