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

2013-09-23 07:52:15 -07:00

res

am a771964f: am 995e69d1: Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev

2013-09-20 18:20:26 -07:00

src/com/android/settings

am 1efb1b52: Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev

2013-09-21 09:35:41 -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

Implement new method for handling SMS/MMS on the platform

2013-09-16 13:45: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%