Martijn Coenen d38d6cb829 am ad320aa8: Merge "Update NFC payments to match new framework APIs." into klp-dev ...

* commit 'ad320aa8d350e859a87269c67d6afd2f5401cf61':
  Update NFC payments to match new framework APIs.

2013-08-29 14:06:24 -07:00

res

am ad320aa8: Merge "Update NFC payments to match new framework APIs." into klp-dev

2013-08-29 14:06:24 -07:00

src/com/android/settings

am ad320aa8: Merge "Update NFC payments to match new framework APIs." into klp-dev

2013-08-29 14:06:24 -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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%