The Android Open Source Project 70b4532d52 am fca2ad6d: (-s ours) Reconcile with jb-mr1-release - do not merge ...

* commit 'fca2ad6dfa28253e859ff9cfe4c2c80229d71a89':

2012-09-28 00:32:54 -07:00

res

Import translations. DO NOT MERGE

2012-09-27 23:42:39 -07:00

src/com/android/settings

am 0c3900af: am 04c4ec60: Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev

2012-09-26 22:04:22 -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

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

2012-09-26 18:02:54 -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%