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

2014-03-27 05:50:40 -07:00

res

Import translations. DO NOT MERGE

2014-03-24 13:07:04 -07:00

src/com/android/settings

Merge "Don't allow user creation on phones via Settings search"

2014-03-26 23:27:10 +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 #13563247 Settings crash on launch in secondary user

2014-03-20 12:24:57 -07:00

CleanSpec.mk

Finally, a place for notification settings.

2014-03-12 14:15:09 -04: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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%