The Android Open Source ProjectandAndroid Git Automerger fc9f20c425 am 917a07d8: (-s ours) Reconcile with jb-mr1-release - do not merge ...

* commit '917a07d8d28b20b5c3949e784e09c5c4d9f966e4':

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

res

Merge "Import translations. DO NOT MERGE"

2012-10-03 08:32:20 -07:00

src/com/android/launcher2

Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev

2012-10-03 14:47:32 -07:00

tests

changing test to use hidden test api annotations.

2011-08-05 17:58:58 -07:00

Android.mk

Add user initialing receiver to select a unique wallpaper.

2012-09-16 00:00:27 -07:00

AndroidManifest.xml

Fix issue #7255954: API Review: rename Dream to DreamService

2012-09-28 17:58:10 -07:00

CleanSpec.mk

Update cleanspec to fix build issue

2012-05-21 13:45:47 -07:00

fill_screens.py

Updating dialtacts to new package.

2012-08-21 13:35:10 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:27 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:27 -08:00

print_db.py

Updating printdb to print hotseat items as well.

2011-08-24 11:32:34 -07:00

proguard.flags

Fixing proguard issues with last change.

2011-08-22 22:44:08 -07:00

S

Description

No description provided

658 MiB

Languages

Java 57.2%

Kotlin 42.4%

AIDL 0.3%