The Android Open Source Project 7e27ede47f am 958c30d4: (-s ours) Reconcile with jb-mr2-release - do not merge ...

* commit '958c30d422801c25b0b67534a5e2083941bad9a8':

2013-05-17 12:56:09 -07:00

res

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

2013-05-14 14:58:12 -07:00

src/com/android/settings

am cea06adc: am 31ce86d3: Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev

2013-05-16 08:40:05 -07:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07: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 b2dccc41: am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev

2013-05-13 14:15:41 -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%