Dianne Hackborn e746f03c6c resolved conflicts for merge of 53686433 to master ...

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d

2010-09-13 16:56:10 -07:00

..

assets

Fix WebView saveState and restoreState for private browsing mode.

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

res

Merge "Import revised translations."

2010-09-13 10:04:58 -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 53686433 to master

2010-09-13 16:56:10 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…