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

2013-09-16 07:53:04 -07:00

res

am 96d315c7: am 77fbf0c7: Merge "Payments: use latest settings icon." into klp-dev

2013-09-16 03:03:05 -07:00

src/com/android/settings

am 256e51d3: Merge "Ignore print service settings activities if they are not exported." into klp-dev

2013-09-15 17:19:38 -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

Activity for messaging installed CA certs, and icon in Settings.

2013-09-14 15:02:51 -04: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%