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

* commit 'eddcf88e64f353be6a85f900e9443583adfe3a65':

2013-07-11 08:08:04 -07:00

res

Merge "Update to show new location monitoring op."

2013-07-10 18:46:04 +00:00

src/com/android/settings

Merge "Use InputMethodUtils in input method settings"

2013-07-11 03:04:28 +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

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%