Dianne Hackborn 203e9529c5 resolved conflicts for merge of 62d005ec to master ...

Change-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd

2010-09-09 23:06:27 -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 62d005ec to master

2010-09-09 23:06:27 -07:00

Android.mk

Update RecentApplications to use shared Carousel widget.

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

AndroidManifest.xml

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

2010-09-08 14:38:15 -07: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