Svetoslav 7dfacf5f8c resolved conflicts for merge of 372cd6ab to master ...

Change-Id: I9232fbe01926436e8ad5c6c7e63ce95fbe842ccb

2013-10-08 17:42:25 -07:00

res

Import translations. DO NOT MERGE

2013-10-07 19:06:16 -07:00

src/com/android/settings

resolved conflicts for merge of 372cd6ab to master

2013-10-08 17:42:25 -07:00

tests

Import translations. DO NOT MERGE

2013-09-09 13:34:45 -07:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

Add accessibility display adjustments to Settings

2013-10-02 16:36: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

NFC payment settings.

2013-08-06 19:16:54 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%