Baligh Uddin dbf91c105a Merge commit '0b849a70' ...

Resolve conflict.

Conflicts:
	AndroidManifest.xml

2013-08-02 14:51:33 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-08-02 16:58:47 +00:00

src/com/android/settings

Merge "Adds a base class for restricted settings"

2013-08-02 21:09:41 +00:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

The Settings app needs privileged permissions

2013-06-17 11:43:23 -07:00

AndroidManifest.xml

Merge commit '0b849a70'

2013-08-02 14:51:33 -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%