The Android Open Source Project c4cdd59e02 Reconcile with klp-release - do not merge ...

Change-Id: Ibab39b9c65854cd80f8b125eace08eea87fb4a95

2013-08-14 14:25:51 -07:00

res

am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev

2013-08-13 17:34:20 -07:00

src/com/android/settings

Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev

2013-08-14 15:58:07 +00: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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%