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

2013-09-11 07:50:26 -07:00

res

am b6a3133d: am e9aa0a94: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev

2013-09-10 13:38:13 -07:00

src/com/android/settings

am eb306b4c: Fix for empty "Listen to an example" string.

2013-09-10 03:19:12 -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

Merge "Print settings polish" into klp-dev

2013-09-05 21:38:11 +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%