The Android Open Source Project 6ab277ee50 Reconcile with jb-mr2-zeroday-release - do not merge ...

Change-Id: I6534b46c13c3ae03f703e70a546f54a59fc4adc0

2013-07-01 07:43:20 -07:00

res

Fix inconsistent string

2013-06-27 09:41:15 -07:00

src/com/android/settings

am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"

2013-06-28 08:08:17 -07:00

tests

Fix Bluetooth enable dialog to match Android style guide.

2012-11-20 18:21:44 -08:00

Android.mk

resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp

2013-04-29 23:30:40 -07:00

AndroidManifest.xml

am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev

2013-06-07 14:55:09 -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%