The Android Automerger 89129c0087 merge in klp-release history after reset to klp-dev

2013-09-02 06:01:42 -07:00

res

Merge "Update captioning settings to match revised API" into klp-dev

2013-08-30 21:35:04 +00:00

src/com/android/settings

am d5c71fc4: am e38165ca: am 7bee4c29: Use correct action string for provisioning.

2013-08-30 17:26:19 -07:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

The Settings app needs privileged permissions

2013-06-17 11:43:23 -07:00

AndroidManifest.xml

Allow navigation to TrustedCredentials User Certs by intent.

2013-08-09 16:21:08 -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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%