Jeff Brown 7218d830e2 resolved conflicts for merge of ca2b552d to master ...

Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b

2011-06-03 15:50:27 -07:00

..

assets

Fix spacing issue

2011-02-10 11:33:35 -08:00

res

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

Android.mk

Update RecentApplications to use shared Carousel widget.

2010-09-03 17:44:57 -07:00

AndroidManifest.xml

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…