Alex Klyubin 48d6b270dd am 3c862fb5: am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev ...

* commit '3c862fb5b66666c96011d065af5d7bf14ed1a2fc':
  Permit deactivation of malformed Device Admins.

2013-06-06 17:54:40 -07:00

res

Follow network stats changes.

2013-06-06 14:35:37 -07:00

src/com/android/settings

am 3c862fb5: am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev

2013-06-06 17:54:40 -07:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

Add EventLog to report lock screen type

2013-06-05 13:01:44 -07:00

AndroidManifest.xml

am 966c2d3f: am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings"

2013-05-20 18:26:12 -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%