Andy Stadler 49fac404e4 resolved conflicts for merge of 7af8cc5e to master ... Change-Id: Ie7364895effcf63b0716682fe6ac24926d1e1da1		2010-11-19 18:46:39 -08:00
assets	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
docs	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
images	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
res	resolved conflicts for merge of 7af8cc5e to master	2010-11-19 18:46:39 -08:00
src	Merge "Show current mailbox name and unread count on action bar."	2010-11-19 13:56:36 -08:00
tests	Allow ProviderTests to work with ContentCache	2010-11-17 10:19:30 -08:00
.classpath
.project
Android.mk	am b95db75b: am b38a043e: Fix proguard flag file dependency.	2010-09-30 11:28:00 -07:00
AndroidManifest.xml	Switch from Theme.Holo.Light.Extended to Theme.Holo.Light	2010-11-15 12:01:45 -08:00
CleanSpec.mk	Add an empty CleanSpec.mk	2010-03-08 18:05:00 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
NOTICE	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
proguard.flags	DO NOT MERGE: Tests for IMAP FETCH	2010-09-20 16:45:47 -07:00
remove-exchange-support.sh	Remove exchange readme and update script	2010-02-04 13:09:34 -08:00