The Android Open Source Project 7e0bcb084d am e696e534: (-s ours) Reconcile with jb-mr1-release - do not merge ...

* commit 'e696e53483068dd6bd0aa0ccde42bc1a1b75d336':

2012-08-21 16:09:57 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-08-21 12:49:43 -07:00

src/com/android/settings

am 5d8378c0: am 4641f4b5: am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is received"

2012-08-21 14:36:55 -07:00

tests

Import translations. DO NOT MERGE

2012-07-13 13:12:21 -07:00

Android.mk

Use telephony-common

2012-07-11 15:08:15 -07:00

AndroidManifest.xml

Make manage apps UI multi-user aware.

2012-08-21 11:14:04 -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%