The Android Open Source Project f1a3161ef3 Reconcile with jb-mr1-release - do not merge ...

Change-Id: I85140e245de7ea2f1cb63252294e4cfe71b8006e

2012-08-22 15:36:24 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-08-21 11:57:12 -07:00

src/com/android/settings

Merge "Simplify proxy regex" into jb-mr1-dev

2012-08-22 14:21:41 -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%