The Android Open Source Project ad0b03a765 am 42dc6df1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge ...

* commit '42dc6df115a0177f5459fecdf0236c73b1e2bdbe':

2013-06-25 17:02:28 -07:00

res

Merge "Setup fontsize change"

2013-06-25 22:20:33 +00:00

src/com/android/settings

am 2295035a: am b17fef80: am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."

2013-06-25 16:30:45 -07:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

Show subtype locales in the personal dictionary

2013-06-20 19:28:34 +09: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

Proguard fix: include notification settings fragment.

2013-02-22 13:17:39 -05:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%