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

* commit '58311f908300bff0174f84d06116225c5d985107':
  Use ConnectivityManager for mobile provision url

2013-07-19 16:02:29 -07:00

res

Import translations. DO NOT MERGE

2013-07-18 14:35:25 -07:00

src/com/android/settings

am ea6b5d63: am 275c1dff: am 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev

2013-07-19 16:02:13 -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%