The Android Open Source Project 18e357cd2e am 90870780: (-s ours) Reconcile with jb-mr1-release - do not merge ...

* commit '90870780c8019d67c2abd502dba3a92dce91bebe':

2012-10-04 07:52:38 -07:00

res

Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev

2012-10-03 17:50:59 -07:00

src/com/android/settings

am f56fa1d8: am 396c24ce: am ffec6eac: Merge "Avoid NPE when installing app update." into jb-mr1-dev

2012-10-03 16:21:29 -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

Navigation fixes for Settings

2012-10-03 16:36: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%