The Android Open Source Project c40e5ffff9 am 6ab277ee: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge ...

* commit '6ab277ee50d91bb6b50cacda55e84ac3afc4323b':

2013-07-01 07:47:44 -07:00

res

am 9495b2f9: am 51d2ff75: am bf87f7d7: Fix inconsistent string

2013-06-27 14:54:10 -07:00

src/com/android/settings

Merge "Don't start the loader task if one is already running"

2013-06-28 22:35:54 +00: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%