The Android Open Source Project 51e3e50acd am dde890a6: (-s ours) Reconcile with jb-mr1-release - do not merge ...

* commit 'dde890a6d34b40eac75a018b659221216e5c7203':

2012-09-24 10:18:44 -07:00

res

am 16a6fd4b: am 7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev

2012-09-24 09:33:50 -07:00

src/com/android/settings

am 16a6fd4b: am 7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev

2012-09-24 09:33:50 -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

First draft of wifi display settings UI.

2012-09-19 21:37:20 -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%