The Android Open Source Project 4325cf22ef am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge ...

* commit '7e107a0903707876c0ad7dd4ee2702fd5baed7ae':

2012-08-07 15:14:14 -07:00

res

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

2012-08-07 14:54:02 -07:00

src/com/android/settings

Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev

2012-08-07 11:49:15 -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 Settings app aware of layout direction

2012-07-24 15:02:12 -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%