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

2013-10-17 07:51:20 -07:00

res

Resolved conflicts for merge of 67e72aa4 to master

2013-10-15 13:37:35 +01:00

src/com/android/settings

am e7f63626: am 820e7010: am 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

2013-10-16 19:35:03 -07:00

tests

Import translations. DO NOT MERGE

2013-09-14 21:12:30 -07:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

am be74fb8d: am 43b8946f: am d9f156dd: Coalescing multiple print job notifications (Settings)

2013-10-10 10:24:35 -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%