Robert Greenwalt ba32c249ad resolved conflicts for merge of 4d9f670b to stage-aosp-master ...

Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b

2013-07-18 20:52:47 -07:00

res

Import translations. DO NOT MERGE

2013-07-15 11:38:16 -07:00

src/com/android/settings

resolved conflicts for merge of 4d9f670b to stage-aosp-master

2013-07-18 20:52:47 -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%