Ying Wang 7d8bb82dca Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge ...

Conflicts:
	core/res/res/values/public.xml

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1

2010-09-07 18:39:03 -07:00

..

assets

Fix WebView saveState and restoreState for private browsing mode.

2010-08-23 09:59:10 -07:00

res

Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge

2010-09-07 18:39:03 -07:00

Android.mk

Update RecentApplications to use shared Carousel widget.

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

AndroidManifest.xml

Don't get stung!

2010-09-03 14:45:45 -04:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00