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

2014-02-06 05:50:48 -08:00

res

Merge "Import translations. DO NOT MERGE"

2014-02-05 21:31:25 +00:00

src/com/android/settings

Merge "Fix bug #12898564 Settings Crash on Renaming the device."

2014-02-05 23:22:33 +00:00

tests

Use Drawer in Settings app

2014-02-03 16:36:46 -08:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

Fix bug #12890909 Tablets: Settings crashes when tapped on Add Account option in settings

2014-02-04 14:01:39 -08: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%