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

* commit 'ff2b0d7f79283665ad3d1fee8a96b3455be7f91d':

2013-07-08 15:48:50 -07:00

res

Import translations. DO NOT MERGE

2013-07-08 09:22:36 -07:00

src/com/android/settings

am 17f1fa42: am 7319f2b1: am 5d5a269f: Add Manage mobile plan to Settings.

2013-07-01 17:01:28 -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%