Kenny Root 26b016320d am d1e485a8: resolved conflicts for merge of 3a271718 to jb-mr2-dev-plus-aosp ...

* commit 'd1e485a8fc84e4aa279fcaf482fa2247b365574a':
  Allow multiuser use of keystore

2013-04-08 12:10:16 -07:00

res

am 3c3a3b7e: am 79b9bfe5: Notification listeners can be enabled in Settings>Security.

2013-04-05 13:02:25 -07:00

src/com/android/settings

am 56e75f3c: am 645e78d8: Merge "Allow multiuser use of keystore" into jb-mr2-dev

2013-04-08 11:07:37 -07:00

tests

Fix Bluetooth enable dialog to match Android style guide.

2012-11-20 18:21:44 -08:00

Android.mk

Remove guava dependency to speed up build.

2013-03-06 11:47:26 -08:00

AndroidManifest.xml

Notification listeners can be enabled in Settings>Security.

2013-04-05 19:57:03 +00: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%