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

2014-03-05 08:06:09 -08:00

res

Merge "Import translations. DO NOT MERGE"

2014-03-04 17:11:05 +00:00

src/com/android/settings

Merge "Fix bug #13300024 Settings app crashes on changing device orientation"

2014-03-04 20:57:51 +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

Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

2014-03-03 11:18:21 -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%