The Android Open Source Project b62576cd6e am 0f1f311e: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge ...

* commit '0f1f311e23dd6fb4a6b857a414ab2f983705f7f8':

2012-10-15 07:43:06 -07:00

res

am 41386e2a: am ded87c82: am 2b62fcb3: Merge "Let\'s enhance" into jb-mr1-dev

2012-10-14 23:07:54 -07:00

src/com/android/settings

am 31d866e1: am a4eabfde: am bc3cab99: Merge "Fix issue #7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev

2012-10-14 11:13:20 -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

Revert "Show warning dialog in a multiuser system when adding a new account."

2012-10-05 19:56:18 -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%