Amith Yamasani 813d23838b am 00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev ...

* commit '00dc15d9dab780e9a61d1b3a20446d6519b5b076':
  Add a settings icon to restricted profile config header

2013-05-14 14:56:13 -07:00

res

Add a settings icon to restricted profile config header

2013-05-13 14:58:56 -07:00

src/com/android/settings

am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev

2013-05-13 14:13:48 -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

Remove wifi scan-always dialog.

2013-05-13 11:39:08 -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%