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

* commit 'f2d9e68c238d754d00fa846b4d4c6737a24595fc':

2013-07-15 09:37:51 -07:00

res

Import translations. DO NOT MERGE

2013-07-10 20:33:24 -07:00

src/com/android/settings

am eeb90735: am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev

2013-07-12 12:14:02 -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

Add developer option for switching between Dalvik and ART

2013-07-10 09:49:07 -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

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%