The Android Automerger 36bdd2f4e2 merge in jb-mr1-release history after reset to jb-mr1-dev

2012-10-23 14:37:43 -07:00

res

Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev

2012-10-23 11:22:39 -07:00

src/com/android/settings

Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev

2012-10-22 17:56:54 -07: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

Revert "Show warning dialog in a multiuser system when adding a new account."

2012-10-05 19:56:18 -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%