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

2013-11-11 07:51:17 -08:00

res

Import translations. DO NOT MERGE

2013-11-06 14:39:01 -08:00

src/com/android/settings

am 6c20565d: am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev

2013-11-07 15:12:58 -08: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%