Dianne Hackborn 41bfa37cb2 resolved conflicts for merge of 409b7120 to master ...

Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538

2010-08-27 12:04:26 -07:00

..

assets

Fix WebView saveState and restoreState for private browsing mode.

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

res

resolved conflicts for merge of 409b7120 to master

2010-08-27 12:04:26 -07:00

Android.mk

Fix dependency

2010-08-18 20:20:03 -07:00

AndroidManifest.xml

am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread

2010-08-11 00:50:56 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…