Jean-Baptiste Queru 9cff5e3f4a am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge ...

* commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':

2013-03-11 12:42:01 -07:00

res

Import translations. DO NOT MERGE

2012-12-12 13:19:14 -08:00

src/com/android/settings

Distinguish adding an already present word / cancelling

2012-12-17 15:52:07 +09:00

tests

Fix Bluetooth enable dialog to match Android style guide.

2012-11-20 18:21:44 -08:00

Android.mk

Iteration on multi-user Storage UI.

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

AndroidManifest.xml

Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev

2012-11-30 18:26:58 -08: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%