Jeff Brown cc633e4965 resolved conflicts for merge of 4110368b to gingerbread-plus-aosp ...

Change-Id: I23f83b1272ba6aef5a4fbadf5e450c1e0b4dd82b

2010-09-30 16:39:16 -07:00

..

BluetoothDebug

Fix proguard flags.

2010-02-19 18:47:02 -08:00

BuildWidget

Widget to show build version at a glance.

2010-01-26 09:56:13 -05:00

CustomLocale

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:18 -08:00

Development

am ebb0b03e: am d424b8d9: Prepare for a new IActivityController method.

2010-09-23 17:34:22 -07:00

Fallback

Import revised translations

2010-03-30 09:14:36 -07:00

FontLab

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:18 -08:00

GestureBuilder

Genericize strings with SD card references.

2010-09-29 10:56:20 -07:00

GraphicsLab

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:18 -08:00

launchperf

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:18 -08:00

NinePatchLab

add test app for ninepatch drawing

2009-09-10 14:20:01 -04:00

OBJViewer

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

SdkSetup

Provision the backup manager in the SDK System image.

2010-06-07 19:24:17 -07:00

SpareParts

fix [2179436] Maps does not display compass when option is turned on

2010-01-20 15:25:55 -08:00

Tag

initial checkin. Needs lots of love.

2010-09-30 15:16:58 -07:00

Term

merge from open-source master

2010-06-02 07:45:47 -07:00