The Android Open Source Project ed7bc2fa00 Reconcile with jb-mr2-release - do not merge ...

Change-Id: I9c8cb7d1325cc9edf656205ce7f5728cc76040ab

2013-05-29 08:06:16 -07:00

res

Import translations. DO NOT MERGE

2013-05-27 11:58:11 -07:00

src/com/android/settings

am c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev

2013-05-28 13:23:35 -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 4abe488a: Merge "No back icon in action bar of APN Settings"

2013-05-20 18:16:42 -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%