Jean-Baptiste Queru a43e270164 am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge ...

* commit '4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
  Completely remove app ops activity.

2013-08-02 17:44:48 -07:00

res

Import translations. DO NOT MERGE

2013-07-29 10:53:05 -07:00

src/com/android/settings

am 35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"

2013-07-29 16:50:30 -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

Completely remove app ops activity.

2013-08-02 14:35:10 -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%