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

2013-09-06 11:31:38 -07:00

res

am f534039f: am 0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev

2013-09-06 09:52:06 -07:00

src/com/android/settings

am 256637ff: Merge "Handle renamed APIs" into klp-dev

2013-09-05 15:51:37 -07:00

tests

Import translations. DO NOT MERGE

2013-08-28 23:43:04 -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%