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

2013-10-10 07:52:36 -07:00

res

am cb2cf8aa: am b371444b: am 16ad5748: Merge "Fix caption settings picker layouts" into klp-dev

2013-10-09 13:34:26 -07:00

src/com/android/settings

am 1acb82c5: am c2d73bed: am 02099910: Fix issue #11033002: Percentages in proc stats details are not rounded correctly

2013-10-09 12:23:52 -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

Add accessibility display adjustments to Settings

2013-10-02 16:36:33 -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%