The Android Open Source Project 861c4229ae am 9a6b238a: (-s ours) Reconcile with jb-mr1-release - do not merge ...

* commit '9a6b238aae5ca1554ce9b6a08d7d9dfb7e66de16':

2012-10-11 06:02:13 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-10-10 21:48:59 -07:00

src/com/android/settings

am 3021168d: am 01f76885: am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev

2012-10-10 22:32:02 -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%