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

2013-09-30 07:51:12 -07:00

res

am 2a2fcdd6: am bc2c3db8: Add print job settings screen.

2013-09-26 14:18:21 -07:00

src/com/android/settings

am bc2c3db8: Add print job settings screen.

2013-09-26 14:14:55 -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

Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev

2013-09-25 23:48:34 +00: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%