Dianne Hackborn 5f28c77bc6 am d6086125: Fix issue #9074296: Device Admins can activate in a way... ...

* commit 'd60861258169083f3174734af821fc8078ec5d2f':
  Fix issue #9074296: Device Admins can activate in a way...

2013-06-06 12:23:05 -07:00

res

resolved conflicts for merge of 33f86196 to stage-aosp-master

2012-09-06 16:09:04 -07:00

src/com/android/settings

am d6086125: Fix issue #9074296: Device Admins can activate in a way...

2013-06-06 12:23:05 -07:00

tests

Fix /proc/version parsing in Settings.

2012-09-10 17:58:15 -07:00

Android.mk

Use telephony-common

2012-07-11 15:08:15 -07:00

AndroidManifest.xml

Add back a SYNC_SETTINGS screen

2012-06-06 20:55:40 -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

User management screens

2012-03-27 12:06:29 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%