The Android Open Source Project 51177f0c30 Reconcile with jb-mr1.1-release - do not merge ...

Change-Id: I538dcad23578c67aac157ea9c60b5e27da195d69

2012-11-06 12:37:59 -08:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

2012-11-04 17:51:15 -08:00

src/com/android/settings

am 95b2db64: am fd34f989: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev

2012-11-05 15:38:26 -08:00

tests

am f587f5a5: am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version parsing in Settings."

2012-09-10 19:05:37 -07:00

Android.mk

Iteration on multi-user Storage UI.

2012-09-13 01:13:48 -07:00

AndroidManifest.xml

New widget picker for keyguard widgets

2012-10-31 16:46:24 -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%