Martijn Coenen 4b396d81bc am 2b8511c1: am ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev ...

* commit '2b8511c1531c1b213f2a23d23772eb8df550cc5a':
  NFC Tap&Pay: deal with changes from API review.

2013-09-03 10:34:45 -07:00

res

am c7e34676: am 6dde146d: Merge "Update captioning settings to match revised API" into klp-dev

2013-08-30 14:42:50 -07:00

src/com/android/settings

am ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev

2013-09-03 10:28:28 -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

NFC Tap&Pay: deal with changes from API review.

2013-08-30 12:57:42 -07: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%