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

2014-01-07 06:22:48 -08:00

res

Merge "Import translations. DO NOT MERGE"

2014-01-07 05:00:49 +00:00

src/com/android/settings

Merge "Remove rotation-lock from Display settings."

2014-01-06 19:22:15 +00:00

tests

Remove deprecated locales

2013-12-09 22:54:15 +00:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

Merge "Settings for NFC Unlock"

2013-12-12 17:38:26 +00: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%